1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
Commit Graph

177 Commits

Author SHA1 Message Date
Julien Duponchelle
61ac8763f2
Merge branch '1.5' into 2.0 2016-06-06 14:28:21 +02:00
Julien Duponchelle
fecd81655e
Support recursive image search
Fix #546
2016-06-02 16:44:38 +02:00
Julien Duponchelle
a702155230
Support multiple images location
Ref #546
2016-06-02 15:34:40 +02:00
Julien Duponchelle
cb7dbfb256
Merge branch '1.5' into 2.0 2016-06-02 13:47:40 +02:00
grossmj
f47eb326c7 Revert move "/version" endpoint to "/server/version".
Move "/server/shutdown" endpoint to "/shutdown".
2016-06-01 18:21:07 -06:00
Julien Duponchelle
7a80dd6cb3
Merge branch '1.5' into 2.0 2016-05-30 11:45:07 +02:00
Julien Duponchelle
a797038aeb
Drop code for temporary projects
Fix https://github.com/GNS3/gns3-gui/issues/982
2016-05-24 17:57:04 +02:00
Julien Duponchelle
00f80f54e8
Merge branch '1.5' into 2.0 2016-05-19 13:32:30 +02:00
Julien Duponchelle
d5895c3a47
Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +02:00
Julien Duponchelle
f052299eb1
Return status in all cases 2016-05-17 19:51:06 +02:00
Julien Duponchelle
cb70cfecd7
Fix docker test 2016-05-16 19:37:47 +02:00
Julien Duponchelle
26c7aedba6
Fix docker test about vm suspended 2016-05-16 17:39:32 +02:00
Julien Duponchelle
ac24922300
Node deleted event
Fix #527
2016-05-16 14:31:00 +02:00
grossmj
51738e19c3 Some spring cleanup for Docker VM. 2016-05-13 19:28:53 -06:00
grossmj
f81d35cc29 Handlers: cleanup and fixes. 2016-05-13 18:00:07 -06:00
Julien Duponchelle
885d93be02
Delete a node work 2016-05-13 17:50:07 +02:00
Julien Duponchelle
5280644327
Return command_line and node_directory via the controller 2016-05-12 10:39:50 +02:00
grossmj
ef7b4ef020 Fixes tests and some PEP8. 2016-05-11 15:19:00 -06:00
grossmj
483431438a Merge remote-tracking branch 'origin/2.0' into 2.0
Conflicts:
	gns3server/controller/project.py
	tests/compute/test_project.py
	tests/controller/test_project.py
2016-05-11 11:41:45 -06:00
grossmj
5a76f81271 Refactoring to use a common node class for all VMs and other (future) objects. 2016-05-11 11:35:36 -06:00
Julien Duponchelle
9ccb55206d
Cleanup code for getting the default project directory 2016-05-11 18:42:55 +02:00
Julien Duponchelle
9dca7dfe4a
Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
Julien Duponchelle
a3b243c501
Merge branch '1.5' into 2.0 2016-05-02 17:08:15 +02:00
Julien Duponchelle
9a1eeb57e9
Controll of the project directory in the controller 2016-04-26 14:34:49 +02:00
Julien Duponchelle
7390d833ba
Merge branch 'master' into 2.0 2016-04-26 11:50:16 +02:00
Julien Duponchelle
48e71617d6
Store capture in a temporary directory on compute node 2016-04-21 17:27:49 +02:00
Julien Duponchelle
58d4a529d4
Rename hypervisor to compute
Fix #487
2016-04-15 17:59:59 +02:00