1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-04 22:28:12 +00:00
Commit Graph

2098 Commits

Author SHA1 Message Date
Julien Duponchelle
5aa9d4d7b9 Do not block on .lock for VMware OSX 2015-09-08 21:31:21 +02:00
grossmj
1e722254f7 Merge remote-tracking branch 'origin/unstable' into unstable 2015-09-08 03:03:38 -06:00
grossmj
8031cf1030 Require Dynamips version 0.2.16 to change the default QinQ Ethernet type. 2015-09-08 03:03:11 -06:00
Julien Duponchelle
92e05e144a Merge branch 'docker' into unstable 2015-09-08 11:00:59 +02:00
Goran Cetusic
0fa300cb99 Initial Docker support from Google Summer of Code 2015-09-08 10:57:28 +02:00
Goran Cetusic
9ee1d9d71a fixed the way docker containers are terminated 2015-09-08 10:54:27 +02:00
grossmj
0ab95ae043 basic docker container support 2015-09-08 10:54:27 +02:00
grossmj
6dd381a745 Merge branch 'Bevaz-qinq_ethertype' into unstable 2015-09-08 02:29:30 -06:00
grossmj
0ddef78127 Merge branch 'qinq_ethertype' of https://github.com/Bevaz/gns3-server into Bevaz-qinq_ethertype 2015-09-08 02:27:21 -06:00
grossmj
2a0f1586c8 Merge remote-tracking branch 'origin/master' 2015-09-08 02:08:32 -06:00
grossmj
2c5b2a19f6 Check for valid FR or ATM switch mappings. Fixes #300. 2015-09-08 02:07:06 -06:00
grossmj
a779fa7462 Check for valid FR or ATM switch mappings. Fixes #300. 2015-09-08 02:00:39 -06:00
grossmj
c992cabb28 VirtualBox VMs can only be started if powered off. Fixes #299. 2015-09-08 01:20:46 -06:00
Julien Duponchelle
4d6626e849 Support of VPCS 0.8
Fix #306
2015-09-07 17:35:21 +02:00
grossmj
4efec03448 Allows VMware VMs to use vmnet interfaces for connections without using uBridge. Fixes #295. 2015-09-05 14:38:11 -06:00
grossmj
476e033a78 Fixes path to vmnet-cli on Mac OS X. 2015-09-05 11:30:26 -06:00
grossmj
a70775a238 Updates vmnet script to support Mac OS X. 2015-09-05 11:20:25 -06:00
Julien Duponchelle
5fa5e7227d Prepare next release 2015-09-04 21:33:48 +02:00
Julien Duponchelle
2689b6b7bb Prepare 1.3.10 2015-09-04 18:22:59 +02:00
Julien Duponchelle
c16d237176 Fix test 2015-09-04 09:13:57 +02:00
Julien Duponchelle
3cf609303d Slack support for Travis 2015-09-04 09:05:44 +02:00
grossmj
fda33c56de Catch exception when a process cannot be killed. Fixes #296. 2015-09-03 16:18:27 -06:00
Julien Duponchelle
5388d43695 Fix closing project when multiple project is open
Fix #305
2015-09-03 17:41:27 +02:00
Julien Duponchelle
986ab649d7 Fix project not closing
Fix #303
2015-09-03 16:46:34 +02:00
Julien Duponchelle
b1ef49672e Qemu user options are at the end. It's allow user to add his own net
interfaces
2015-08-27 18:46:02 +02:00
Julien Duponchelle
d853ffe791 Change the way we look for Qemu path
Fix #302
2015-08-27 18:27:17 +02:00
Julien Duponchelle
c361d27531 Lock qemu vm during start / stop operations
Fix #301
2015-08-27 16:06:11 +02:00
Julien Duponchelle
699647dbda In the error message explain how to turn off KVM support 2015-08-26 17:17:40 +02:00
Julien Duponchelle
4cc66a3801 Fix when you stop qemu on windows you have an error
Fix #625
2015-08-26 17:01:16 +02:00
Julien Duponchelle
8085080e41 Merge branch 'master' into unstable 2015-08-26 14:36:55 +02:00
Julien Duponchelle
fea7a8a9ab Fix Qemu cannot be used on Windows
Fix #291
2015-08-26 13:47:12 +02:00
Julien Duponchelle
70f62cd5eb Allow to start server with python -m gns3server 2015-08-25 22:31:45 +02:00
Julien Duponchelle
796ca86df9 Fix random failures in tests on OSX and Windows 2015-08-25 10:13:49 +02:00
Julien Duponchelle
f0f901a15d Should solve the BufferError by avoiding using thread
Fix #293
2015-08-24 19:59:11 +02:00
Julien Duponchelle
34e64fe5d8 Catch UnicodeEncodeError when passing unicode char as qemu options
Fix #292
2015-08-24 18:09:01 +02:00
Julien Duponchelle
1a04417e84 1.4.0dev6 2015-08-24 17:16:46 +02:00
Anton Fedotov
1283f8bde8 EthernetSwitch: Allow to choose ethertype for QinQ outer tag. 2015-08-20 09:42:30 +03:00
grossmj
eb5f9c48f2 Backport: fixes NAT NIO for Qemu VMs (do not launch any legacy scripts) 2015-08-14 22:16:02 -06:00
grossmj
98112f7fac Fixes NAT NIO for Qemu VMs (do not launch any legacy scripts) 2015-08-14 22:15:01 -06:00
grossmj
a16d6ac88f Lower VMware requirements to Workstation version 10 and Player version 6. 2015-08-14 20:35:04 -06:00
grossmj
83a7e25389 Fixes Unicode error. Fixes #290. 2015-08-13 20:15:50 -06:00
grossmj
ab3700854c Don't delete Dynamips ROM files. They are used to restore the nvram. 2015-08-10 21:23:05 -06:00
grossmj
2ce01fafc0 Don't delete Dynamips ROM files. They are used to restore the nvram. 2015-08-10 21:22:21 -06:00
grossmj
764e0df29a Adds pywin32 dependency in setup.py for Windows. 2015-08-10 18:36:25 -06:00
Julien Duponchelle
31b91e1ccb 1.4.0beta1 2015-08-07 18:39:59 +02:00
Julien Duponchelle
0018658f60 Fix ram setting for Qemu 2015-08-07 17:08:22 +02:00
Julien Duponchelle
55f7c79918 Explicit set qemu memory as MB 2015-08-07 17:03:06 +02:00
Julien Duponchelle
323674ba5c Turn off KVM for non x86 architectures
Fix #289
2015-08-07 16:49:45 +02:00
Julien Duponchelle
8b46a1a4ab Fix tests 2015-08-07 09:21:09 +02:00
grossmj
05ab18f295 Send an error when vmware executable cannot be found on Linux. Fixes #288. 2015-08-06 23:05:10 -06:00