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
|
a0344576ba
|
Show version for debug
|
2016-05-11 16:31:16 +02:00 |
|
Julien Duponchelle
|
95d2bd0065
|
Merge branch '1.5' into 2.0
|
2016-05-11 16:16:29 +02:00 |
|
Julien Duponchelle
|
fa140e991c
|
Merge branch 'master' into 1.5
|
2016-05-11 16:16:11 +02:00 |
|
Julien Duponchelle
|
f4b79af45f
|
Move tools for creating self signed certificate to clean repo
|
2016-05-11 16:13:32 +02:00 |
|
Julien Duponchelle
|
c2da568543
|
Protect controller and compute about path outside project directory
Fix #503
|
2016-05-11 15:59:32 +02:00 |
|
Julien Duponchelle
|
390401000f
|
A client could not erase the local compute node config in the controller
Fix #499
|
2016-05-11 15:02:35 +02:00 |
|
Julien Duponchelle
|
cd836f146e
|
Create the project on compute only when needed
|
2016-05-11 10:56:43 +02:00 |
|
Julien Duponchelle
|
f414ce459a
|
1.5.0dev3
|
2016-05-11 10:03:03 +02:00 |
|
Julien Duponchelle
|
366e9620dc
|
Prepare 1.5.0 alpha 2
|
2016-05-10 19:14:50 +02:00 |
|
Julien Duponchelle
|
e108a9e136
|
Prepare alpha 1
|
2016-05-10 17:58:11 +02:00 |
|
Julien Duponchelle
|
9dca7dfe4a
|
Merge branch '1.5' into 2.0
|
2016-05-10 17:51:40 +02:00 |
|
Julien Duponchelle
|
9e2043bfa8
|
Ensure that the connection to docker is closed when leaving server
Fix https://github.com/GNS3/gns3-gui/issues/1227
|
2016-05-10 12:14:48 +02:00 |
|
Julien Duponchelle
|
28f7c2a1cd
|
Ensure in all cases the docker console is closed before restart
Fix https://github.com/GNS3/gns3-gui/issues/1226
|
2016-05-10 11:39:59 +02:00 |
|
Jeremy Grossmann
|
c7d58eb3b3
|
Merge pull request #518 from GNS3/detect_eth
Wait for all interfaces available in container
|
2016-05-09 10:54:37 -06:00 |
|
Jeremy Grossmann
|
41f02dad54
|
Merge pull request #516 from GNS3/improve_parse_version
Improve parse_version
|
2016-05-07 11:02:58 -06:00 |
|
grossmj
|
76cc1d2750
|
Fixes call to export project.
|
2016-05-07 10:39:32 -06:00 |
|
Julien Duponchelle
|
2cdfd6c0d7
|
Wait for all interfaces available in container
Fix #511
|
2016-05-06 19:07:18 +02:00 |
|
Julien Duponchelle
|
57cf57b408
|
Improve parse_version
Ref #515
|
2016-05-06 17:09:03 +02:00 |
|
grossmj
|
16b5bb8810
|
Workaround for exception when using gns3server.utils.parse_version. Fixes #513.
|
2016-05-05 10:15:51 -06:00 |
|
Julien Duponchelle
|
56c153af79
|
Make HTTP support more reliable with home made HTTP server
|
2016-05-04 16:32:45 +02:00 |
|
Julien Duponchelle
|
9beca700a5
|
PEP8
|
2016-05-04 16:32:37 +02:00 |
|
Julien Duponchelle
|
8e429ee4c1
|
Ban port dissalowed by chrome and firefox
|
2016-05-03 21:07:01 +02:00 |
|
Julien Duponchelle
|
f3095d94c1
|
Replace port in HTTP flow for docker
|
2016-05-03 18:01:23 +02:00 |
|
Julien Duponchelle
|
5fd385159c
|
HTTP support for docker
Fix #509
|
2016-05-03 16:49:33 +02:00 |
|
Julien Duponchelle
|
dcbaa62df8
|
Better aux console for docker
Fix #472
|
2016-05-03 11:33:43 +02:00 |
|
Julien Duponchelle
|
e9fb7f4981
|
Make sure an image is not partially uploaded
Fix #505
|
2016-05-02 17:25:46 +02:00 |
|
Julien Duponchelle
|
d952718f30
|
Fix RuntimeWarning: You have iterated over the result of
pkg_resources.parse_version. This is a legacy behavior
Fix #504
|
2016-05-02 17:14:15 +02:00 |
|
Julien Duponchelle
|
98b32cd9e2
|
Merge branch '1.5' into 2.0
|
2016-05-02 16:59:56 +02:00 |
|
Julien Duponchelle
|
c17e00204f
|
Auto reconnect to docker if connection was closed
Fix #507
|
2016-05-02 16:55:05 +02:00 |
|
Julien Duponchelle
|
936faaba5a
|
gns3z => gns3project
|
2016-05-02 10:33:04 +02:00 |
|
grossmj
|
5c1522f24a
|
Bump version to 1.5.0dev2
|
2016-04-28 23:47:17 -06:00 |
|
Julien Duponchelle
|
848120c354
|
1.4.7dev1
|
2016-04-28 18:38:11 +02:00 |
|
Julien Duponchelle
|
8a19afd618
|
1.4.6
|
2016-04-28 18:27:33 +02:00 |
|
Julien Duponchelle
|
815ef6066d
|
Merge branch 'master' into 1.5
|
2016-04-28 16:52:29 +02:00 |
|
Julien Duponchelle
|
85f571ee8b
|
Solve wintypes import
|
2016-04-28 16:35:58 +02:00 |
|
Julien Duponchelle
|
cf1b7ebe1f
|
Raise error if qemu can not create backing image
|
2016-04-27 15:12:15 +02:00 |
|
grossmj
|
4fc5364ab5
|
More robust save/restore for VirtualBox linked clone VM hard disks.
|
2016-04-26 15:44:11 -06:00 |
|
grossmj
|
4a91d8a6a5
|
Prevent non linked cloned hard disks to be detached when using VirtualBox linked cloned VMs. Fixes #1184.
|
2016-04-26 15:06:22 -06:00 |
|
Julien Duponchelle
|
f98f6bf3ed
|
Close doesn't exists when stopping the capture
|
2016-04-26 22:19:38 +02:00 |
|
grossmj
|
b408f29726
|
Stricter checks to match VMware version to the right vmrun (VIX library) version.
Also checks the VIX library version when only using the GNS3 VM running in VMware.
|
2016-04-26 13:12:42 -06:00 |
|
Julien Duponchelle
|
92d1594afd
|
Return link object when start capturing
|
2016-04-26 18:13:15 +02:00 |
|
Julien Duponchelle
|
76b2ca2bc0
|
Return the full path to the capture
|
2016-04-26 17:36:24 +02:00 |
|
Julien Duponchelle
|
264254e657
|
Captures written in the captures directory on the controller
|
2016-04-26 17:10:33 +02:00 |
|
Julien Duponchelle
|
9a1eeb57e9
|
Controll of the project directory in the controller
|
2016-04-26 14:34:49 +02:00 |
|
Julien Duponchelle
|
893b05d26b
|
Removed unused code
|
2016-04-26 11:52:35 +02:00 |
|
Julien Duponchelle
|
7390d833ba
|
Merge branch 'master' into 2.0
|
2016-04-26 11:50:16 +02:00 |
|
Julien Duponchelle
|
1d08d4a5fa
|
Merge branch 'master' into 1.5
|
2016-04-26 11:49:24 +02:00 |
|