ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-22 14:12:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,739 Commits 5 Branches 205 Tags 76 MiB
e3580d52c3
Commit Graph

1424 Commits

Author SHA1 Message Date
Julien Duponchelle
c7cc155b78 Merge branch 'master' into unstable 2015-11-12 10:55:19 +01:00
grossmj
11cf2294da Remove NIO FIFO and Mcast (unused). Fixes #348. 2015-11-11 16:20:28 -07:00
Julien Duponchelle
3f4da9050c Support VPCS 0.6.1 2015-11-11 21:57:58 +01:00
Julien Duponchelle
63edcc1c34 Fix duplicate of -no-kvm options 
Fix #356
 2015-11-10 16:25:02 +01:00
Julien Duponchelle
caade47e16 Fix tests about images paths security 2015-11-10 15:21:10 +01:00
Julien Duponchelle
390c88d7cd Raise an error if user send a non local path to remote server 2015-11-09 19:02:10 +01:00
Julien Duponchelle
ab4c8665e4 Fix backup projects and a qemu broken tests 2015-11-09 14:17:19 +01:00
Julien Duponchelle
ac16ee5bc6 Fix minor issues 2015-11-09 12:32:36 +01:00
Julien Duponchelle
da240f21ba Apply pep8 fix 2015-11-09 12:28:00 +01:00
Julien Duponchelle
1248584841 Cleanup unused and duplicates 2015-11-09 12:14:25 +01:00
Julien Duponchelle
58d2a5d4b0 Support VPCS 0.6.1 
Fix #347
 2015-11-09 10:26:16 +01:00
grossmj
bd47c21514 Sets console end port to 7000. Fixes #343. 2015-11-08 18:14:55 -07:00
grossmj
c3e99bfc1d Drop netifaces (replaced by psutil). Fixes #344. 2015-11-08 13:34:27 -07:00
grossmj
9ca72f3bbc Correctly display log messages. 2015-11-08 12:01:25 -07:00
grossmj
e4735308f8 Merge remote-tracking branch 'origin/master' 2015-11-07 12:18:05 -07:00
grossmj
13a3e8f324 Tentative fix for "WinError 64 The specified network name is no longer available" issues. 2015-11-07 12:17:53 -07:00
Julien Duponchelle
6fbc84c0dc Return relative path for dynamips images 
Fix https://github.com/GNS3/gns3-gui/issues/775
 2015-11-05 16:47:37 +01:00
Julien Duponchelle
7ee12edb5c Fix add existing IOS not working 
Fix https://github.com/GNS3/gns3-gui/issues/775
 2015-11-05 16:28:11 +01:00
Julien Duponchelle
7e7c8a5450 Correctly enable faulthandler for dev version 2015-11-05 10:50:37 +01:00
Julien Duponchelle
d9f94e653b Allow vpcs 0.8b 2015-11-04 14:37:27 +01:00
Julien Duponchelle
12f027a882 Allow to return an empty project name because it's allowed in creation 2015-11-03 17:11:58 +01:00
Julien Duponchelle
7967a922bc Merge branch 'master' into unstable 2015-11-03 12:39:01 +01:00
Julien Duponchelle
bd54c55ae1 Fix minor errors reported by codacy.com 2015-11-03 12:34:22 +01:00
Julien Duponchelle
ef5ce99125 1.4.0dev11 2015-11-02 21:30:22 +01:00
grossmj
f313ac10c3 1.4.0b5 2015-11-02 10:55:32 -07:00
Julien Duponchelle
69c38c6414 Use pytest 2.8 so it's work with Python 3.5 without warning 2015-11-02 16:35:12 +01:00
grossmj
82540e5366 Fixes wait for named pipe creation. 2015-11-01 20:52:07 -07:00
grossmj
32f9baf682 Fixes Windows named pipe issue. Fixes #340. 2015-11-01 18:51:12 -07:00
Julien Duponchelle
6edb41ded7 Merge branch 'master' into unstable 2015-10-30 15:17:17 +01:00
Julien Duponchelle
42c8fb7c29 Raise an error when you use a port outside the ranges 
Fix #739
 2015-10-30 15:15:28 +01:00
Julien Duponchelle
c2a08a391c Fix crash in IOU config export 
Fix #335
 2015-10-21 14:28:39 +02:00
Julien Duponchelle
db2aa56e98 1.4.0dev10 2015-10-19 19:13:58 +02:00
grossmj
d5dba699c5 1.4.0b4 2015-10-19 11:09:18 -06:00
grossmj
ce4727e51a Support for modifications to a base Qemu VM (not a linked clone). 2015-10-18 19:19:27 -06:00
Julien Duponchelle
2fbc391319 Force canceling all task when shutdown server 
https://bugs.python.org/issue24080

Fix #705
 2015-10-16 20:42:13 +02:00
Julien Duponchelle
504a4af4ab Enforce console port for VNC 
Ref https://github.com/GNS3/gns3-gui/issues/721
 2015-10-16 18:16:07 +02:00
grossmj
6e36687347 Fixes issue when loading a project using VMware vmnet interfaces. Fixes #319. 2015-10-14 21:39:17 -06:00
grossmj
57bbd63085 Support for NAT connection with cloud for VMware VMs. Fixes #322. 2015-10-12 17:07:39 -06:00
grossmj
b53f0e89ce Change message when VMware is not installed on Linux. Ref #326. 2015-10-12 16:27:31 -06:00
grossmj
ac75977ae0 Send a warning notification if there is not enough RAM left to start a VM. Implements #329. 2015-10-12 15:57:37 -06:00
Julien Duponchelle
c700804014 Merge branch 'master' into unstable 2015-10-12 17:09:33 +02:00
Julien Duponchelle
91c2bd7e98 Asyncio qemu fix and raise error if coroutine not used 2015-10-12 17:06:50 +02:00
Julien Duponchelle
0a536278fc Fix asyncio error when closing the app 
Fix #310, https://github.com/GNS3/gns3-gui/issues/705
 2015-10-12 16:16:44 +02:00
grossmj
5cb2b33a99 Removes VMware lock check. Fixes #328. 2015-10-11 16:41:55 -06:00
grossmj
133b01b2a6 Merge remote-tracking branch 'origin/unstable' into unstable 2015-10-11 15:51:05 -06:00
grossmj
ee6ef9f3d5 Wait for pipe file to be created before starting the remote console for VMware and VirtualBox VMs. Fixes #331. 2015-10-11 15:50:50 -06:00
Julien Duponchelle
ccd45c2f45 Merge branch 'master' into unstable 2015-10-08 11:30:16 +02:00
grossmj
a6286db7b1 Release UDP ports when closing a Qemu VM. Fixes #323. 2015-10-07 20:48:36 -06:00
Julien Duponchelle
6cd790880c 1.3.12dev1 2015-10-07 18:26:18 +02:00
Julien Duponchelle
b19bfa0270 1.3.11 release 2015-10-07 18:24:03 +02:00
Julien Duponchelle
9c23093510 Merge branch 'master' into unstable 2015-10-07 16:44:50 +02:00
Julien Duponchelle
98ac295e2e Escape other usage of glob 
Fix #332
 2015-10-07 16:42:34 +02:00
Julien Duponchelle
c50c735e86 Merge branch 'master' into unstable 2015-10-07 13:51:28 +02:00
Julien Duponchelle
acd5c992ba Fix Dynamips identifier is already used by another router 
Fix #327
 2015-10-07 13:50:40 +02:00
Julien Duponchelle
9b740e85d0 Fix Dynamips identifier is already used by another router 
Fix #327
 2015-10-07 11:34:27 +02:00
Julien Duponchelle
da7f910482 glob.escape is available with Python 3.4 2015-10-07 10:27:42 +02:00
Julien Duponchelle
4c13f8e6ea Merge branch 'master' into unstable 2015-10-07 10:27:06 +02:00
Julien Duponchelle
4232ea8a00 Protect dynamips against bad glob 
Fix #332
 2015-10-07 10:26:37 +02:00
Julien Duponchelle
ec7a9615ac Fix issue with Qemu networking following merge 2015-10-07 09:01:17 +02:00
Julien Duponchelle
5e3ce48a52 Merge branch 'master' into unstable 2015-10-06 19:19:56 +02:00
Julien Duponchelle
3d7d8682ee OVA file support 2015-10-06 17:50:54 +02:00
Julien Duponchelle
034ac392b7 Support listing images in subdirectories 
It's a part of the OVA support:
https://github.com/GNS3/gns3-gui/issues/700
 2015-10-05 11:07:15 +02:00
grossmj
fc5afa6676 Catch ProcessLookupError in Qemu VM. 2015-10-04 14:20:44 -06:00
grossmj
3f86df5169 Fixes uncalled coroutine. 2015-10-04 07:00:47 -06:00
grossmj
970f22a83e Use the correct UDP tunnel Qemu syntax for version > 1.1.0 when legacy networking is enabled. 2015-10-04 06:41:39 -06:00
Julien Duponchelle
dd7f6eb021 Fix crash 2015-10-02 15:04:42 +02:00
Julien Duponchelle
d19b3f15ed VMware player linux support 
Fix #326
 2015-10-02 11:04:54 +02:00
grossmj
80d99ec395 Fixes some minor issues. 2015-09-29 14:15:01 -06:00
grossmj
8560521028 Merge remote-tracking branch 'origin/master' 2015-09-29 06:58:33 -06:00
grossmj
e63e3280a1 Prevent launching a packet capture with a non-ASCII path when using Dynamips. 2015-09-29 06:56:01 -06:00
grossmj
9737783eb6 Do not require a TAP interface to already exist. Fixes #321. 2015-09-26 10:09:50 -06:00
grossmj
09aa31fb43 Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform. 2015-09-23 13:42:37 +02:00
grossmj
d01a8bfb34 Bump version to 1.4.0.dev9 2015-09-22 16:07:21 -06:00
Julien Duponchelle
6ca0154435 Prepare 1.4.0b3 2015-09-22 17:37:44 +02:00
Julien Duponchelle
e7ea9e8047 Merge branch 'master' into unstable 2015-09-22 14:40:13 +02:00
Julien Duponchelle
bfe3b12342 Fix dynamips configuration lost when you delete a node 
Fix #316
 2015-09-22 14:39:21 +02:00
Julien Duponchelle
bf0813b4b9 Merge branch 'master' into unstable 2015-09-22 13:46:08 +02:00
Julien Duponchelle
c43960fbfd Clarify error message when we got UTF-8 chars in the iourc file 
Fix #307
 2015-09-22 13:45:10 +02:00
Julien Duponchelle
6a6beb752a Merge remote-tracking branch 'origin/master' into unstable 2015-09-22 11:03:41 +02:00
grossmj
2c3d7510be Fixes version mismatch issue. 2015-09-20 13:28:37 -06:00
grossmj
5bcabc705f Use custom VMnet interfaces without host adapter when uBridge is not used. Fixes #673. 2015-09-20 13:19:57 -06:00
grossmj
c5ce6af872 Bump version to 1.4.0dev8 2015-09-18 15:41:34 -06:00
grossmj
b90df5806d Automatically add the -no-kvm option if -icount is detected to help with the migration of ASA VMs created before version 1.4 2015-09-18 15:40:56 -06:00
Julien Duponchelle
a016c458a6 1.4.0 beta2 2015-09-17 16:46:22 +02:00
Julien Duponchelle
b1f3210a4c Fix a crash at vmware stop 
Fix https://github.com/GNS3/gns3-gui/issues/665
 2015-09-17 15:51:46 +02:00
Julien Duponchelle
bb080fa96a Fix a crash when starting a VMware vm 
Fix #314
 2015-09-17 15:46:06 +02:00
Julien Duponchelle
e236f63162 Add how to add vmnet interfaces explantion in the error message 2015-09-17 15:18:55 +02:00
Julien Duponchelle
3e71529702 Fix path of VMinventory for fusion 
Fix #313
 2015-09-17 11:04:24 +02:00
Julien Duponchelle
802d0628bd Force close the keep alive when sending a 401 
Work around a Qt issue where Qt
timeout instead of handling the 401
this happen only for the first query send by the
client.
 2015-09-16 15:53:38 +02:00
grossmj
958274e8f6 Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform. 2015-09-16 06:09:14 -06:00
grossmj
e374e52745 Bump version to 1.4.0dev7. 2015-09-14 15:19:57 -06:00
grossmj
59f5de5de2 Throw an error if ubridge as incorrect permissions. Fixes #312. 2015-09-14 15:05:25 -06:00
grossmj
a9ac0d3380 This may fix "The semaphore timeout period has expired" error on Windows. #311. 2015-09-13 15:47:43 -06:00
grossmj
65fa4036c6 Fixes bug with VMware VM connections + moves some uBridge code to BaseVM. 2015-09-13 14:52:25 -06:00
grossmj
0ee31361c0 Support for packet capture on VMware VM links. 2015-09-13 09:40:09 -06:00
Julien Duponchelle
22e4fec2e2 Fix ProcessLookupError on _checkAlive Qemu 
Fix #308
 2015-09-11 14:16:56 +02:00
grossmj
cc7fe1a477 VMware Fusion support with uBridge. 2015-09-10 03:44:56 -06:00
grossmj
46698924fd Merge remote-tracking branch 'origin/unstable' into unstable 2015-09-09 02:39:06 -06:00
grossmj
8e29ad4493 Updates vmnet script to support Windows. 2015-09-09 02:38:11 -06:00
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
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
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
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
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
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
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
grossmj
05ab18f295 Send an error when vmware executable cannot be found on Linux. Fixes #288. 2015-08-06 23:05:10 -06:00
grossmj
5121753232 Support for CPUs setting for Qemu VMs. 2015-08-05 17:17:55 -06:00
grossmj
217945339e Bump version to 1.4.0dev5. 2015-08-04 11:59:35 -06:00
grossmj
f161bf42fa Bump version to 1.4.0alpha4. 2015-08-04 11:58:34 -06:00
grossmj
e46ecdc37c Bump version to 1.4.0dev5. 2015-08-04 11:53:59 -06:00
grossmj
2e6c438208 1.4.0alpha4 2015-08-04 11:51:25 -06:00
Julien Duponchelle
1613999689 Quote command in qemu debug logs so you can copy/paste them 2015-08-04 17:06:42 +02:00
Julien Duponchelle
39c1d2d2dd Prepare 1.3.10 2015-08-03 19:25:56 +02:00
Julien Duponchelle
d942f52f7d 1.3.9 2015-08-03 18:52:22 +02:00
grossmj
0923ed5d85 Support for Qemu disk interfaces, cd/dvd-rom image and boot priority. Fixes #278. 2015-08-02 23:02:02 -06:00
grossmj
7bccf9e554 Check for VMware Player version >= 7 and VMware Workstation >= 11. Fixes #286. 2015-08-01 13:49:02 -06:00
grossmj
bb69f02da6 Catch GeneratorExit exception when trying to create a Ghost IOS image. 2015-08-01 11:50:16 -06:00
grossmj
06a6287dff Backport: removes code that deletes IOS router instance files. 2015-07-31 14:37:23 -06:00
Julien Duponchelle
7c1dd75ad7 1.4.0dev4 2015-07-31 15:33:22 +02:00
grossmj
87ec90cdaf Removes code that deletes IOS router instance files. 2015-07-30 18:50:59 -06:00
Julien Duponchelle
c2807c39f9 1.4.0alpha3 2015-07-29 18:17:03 +02:00
Julien Duponchelle
1fd2332796 PEP8 2015-07-28 17:57:36 +02:00
Julien Duponchelle
78ef6e3032 Validation schema for qemu-img 2015-07-28 17:50:57 +02:00
Julien Duponchelle
003c2f5f0b New crash report key 2015-07-28 16:48:22 +02:00
Julien Duponchelle
e92d9ca5ff Raise error if qemu image already exist when creating disk 2015-07-28 16:15:01 +02:00
Julien Duponchelle
54448ab936 Prevent user to create a qemu to a different directory on non local 
server
 2015-07-28 16:07:13 +02:00
Jeremy
f761fb77f8 Fixes UnicodeDecodeError when reading a VMware file. 2015-07-27 16:29:02 -06:00
Jeremy
a721d7d910 Fixes KeyError: "ethernet0.connectiontype". Fixes #276. 2015-07-27 15:50:09 -06:00
Jeremy
1419b7c8dc Fixes replace errors. Fixes #284. 2015-07-27 15:31:42 -06:00
Julien Duponchelle
c2ba3f923e 1.3.9dev1 2015-07-27 20:11:49 +02:00
Jeremy
bdb23d6d3b 1.3.8 2015-07-27 12:10:01 -06:00
Jeremy
2ed0ef770e Catch ProcessLookupError when updating iouyap config. Fixes #255. 2015-07-27 11:41:13 -06:00
Jeremy
5986849b67 Catch ProcessLookupError when updating iouyap config. Fixes #255. 2015-07-27 11:40:01 -06:00
Julien Duponchelle
5b0c36c0d6 API for creating a qemu disk image 2015-07-27 19:18:36 +02:00
Julien Duponchelle
5d8c90d138 Rename qemu image type to qemu image format 2015-07-27 17:32:27 +02:00
Julien Duponchelle
b94a4e2308 Add code for creating qemu image on server side 
Ref https://github.com/GNS3/gns3-gui/issues/558
 2015-07-27 16:27:14 +02:00
Jeremy
fcd4fda68e Prevent starting different hypervisors that leverage hardware virtualization (VT-x/AMD-V). Fixes #548. 2015-07-26 19:21:30 -06:00
Jeremy
eb5e019a26 Fixes IOS adapters and WICS cannot be removed. Fixes #282. 2015-07-26 15:52:43 -06:00
Jeremy
76fe0cb316 Fixes IOS adapters and WICS cannot be removed. Fixes #282. 2015-07-26 15:51:55 -06:00
Jeremy
4aeb451ffd Makes sure the loop is running when closing the app. 2015-07-26 15:28:14 -06:00
Jeremy
5f5d9347b9 Makes sure the loop is running when closing the app. 2015-07-26 15:27:47 -06:00
Jeremy
31b168aa42 Catch Permission denied when writing to VMX file while closing VMware VM. Fixes #277. 2015-07-25 17:09:10 -06:00
Jeremy
382747a2f2 Catch GeneratorExit exception. Fixes #231. 2015-07-25 16:55:37 -06:00
Jeremy
64bf935222 Fixes missing chipset info for VirtualBox VM (maybe some older VirtualBox version don't have it). Fixes #254. 2015-07-25 16:54:31 -06:00
Jeremy
7b001e4d36 Catch GeneratorExit exception. Fixes #231. 2015-07-25 16:46:23 -06:00
Jeremy
b1b602db3b Merge remote-tracking branch 'origin/master' 2015-07-25 16:39:45 -06:00
Jeremy
cf5af8a6f7 Fixes missing chipset info for VirtualBox VM (maybe some older VirtualBox version don't have it). Fixes #254. 2015-07-25 16:39:38 -06:00
Jeremy
8a257b3b2e Changes how to look for the vmrun.exe location. 2015-07-24 16:50:36 -06:00
Julien Duponchelle
d9f1a7c7d3 API for listing current projects 
Fix #274
 2015-07-24 10:09:16 +02:00
Julien Duponchelle
4814bc6c65 Fix IOURC upload 2015-07-23 11:36:11 +02:00
Julien Duponchelle
cbc859a03b Merge remote-tracking branch 'origin/master' into unstable 2015-07-23 11:35:15 +02:00
Julien Duponchelle
3f25bfcb27 Fix qemu tests 2015-07-23 10:46:43 +02:00
Jeremy
9b3b5f1884 Bump version to 1.4.0dev3 2015-07-22 20:55:54 -06:00
Jeremy
2655d426c2 Backport: option to drop nvram & disk files for IOS routers in order to save disk space. 2015-07-22 16:02:08 -06:00
Jeremy
1b499571b1 Deactivate uBridge process monitoring (process returns 1 on Windows when stopping). 2015-07-22 12:03:40 -06:00
Jeremy
8e236a7045 Prevent using different hypervisors that leverage hardware virtualization. 
- Implemented for Qemu when a VMware or VirtualBox VM with hardware virtualization is already running.
- Implemented for VirtualBox only when a Qemu VM with KVM is already running.
 2015-07-21 22:58:28 -06:00
Jeremy
f1bbacecd6 Backport: Remove timeout to wait for connections to finish. 2015-07-21 18:00:31 -06:00
Jeremy
accaa2159b Remove timeout to wait for connections to finish. 2015-07-21 18:00:03 -06:00
Jeremy
fc0409286b Check for uBridge version and catch uBridge errors. 2015-07-21 17:58:53 -06:00
Jeremy
f0649b4ac3 Remove default FLASH when no hda disk for Qemu VMs. Fixes #535. 2015-07-21 16:45:44 -06:00
Jeremy
8cc46f66c6 Fixes indentation mistakes. 2015-07-21 16:04:55 -06:00
Jeremy
a8142a04f8 Merge remote-tracking branch 'origin/master' 2015-07-21 16:02:52 -06:00
Jeremy
19425b1e9c Backport: Fixes RuntimeError: Event loop is closed. 2015-07-21 16:02:44 -06:00
Jeremy
abd9c1dc48 Use the registry to find vmrun if the default VMware install path does not exist. 2015-07-21 15:59:29 -06:00
Jeremy Grossmann
1b066bef92 Merge pull request #272 from GNS3/backup_upload_images_projects 
Backup upload images projects
 2015-07-21 11:21:12 -07:00
Julien Duponchelle
6bf7a6aa38 Fix after jeremy feedback 2015-07-21 20:19:29 +02:00