1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-05 23:59:09 +00:00
Commit Graph

1346 Commits

Author SHA1 Message Date
Julien Duponchelle
cbc859a03b Merge remote-tracking branch 'origin/master' into unstable 2015-07-23 11:35:15 +02:00
Julien Duponchelle
0f369bc40b ifconfig is not available on travis new architecture 2015-07-23 10:58:34 +02:00
Julien Duponchelle
631ad76149 Switch from travis legacy architecture to the new one 2015-07-23 10:56:15 +02:00
Julien Duponchelle
3f25bfcb27 Fix qemu tests 2015-07-23 10:46:43 +02:00
Jeremy
e07c3215f5 Merge remote-tracking branch 'origin/unstable' into unstable
Conflicts:
	gns3server/version.py
2015-07-22 20:56:43 -06: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
Julien Duponchelle
cc820f2584 Changelog 2015-07-22 20:47:42 +02: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
Julien Duponchelle
15a7401654 Merge branch 'master' into unstable 2015-07-21 18:52:21 +02:00
Julien Duponchelle
fc14deee1b Restore images & projects tarballs 2015-07-21 16:14:03 +02:00
Julien Duponchelle
270017d945 Allow user to backup projects and images 2015-07-21 14:20:58 +02:00
Jeremy Grossmann
23a03a24de Merge pull request #271 from lykinsbd/master
Update gns3.conf.upstart
2015-07-20 22:44:40 -07:00
Jeremy
439e0df058 Bind host on 0.0.0.0 when checking for a free UDP port. 2015-07-20 19:27:14 -06:00
Jeremy
d5c0584d25 Bind host on 0.0.0.0 when checking for a free UDP port. Fixes #265. 2015-07-20 19:22:20 -06:00
Jeremy
6ee94331d4 Fixes RuntimeError: Event loop is closed. Fixes #266. 2015-07-20 16:02:28 -06:00
Brett Lykins
c94dc1ec07 Update gns3.conf.upstart
Fixing start-stop-daemon syntax so that it accepts the aruments
2015-07-20 10:42:34 -05:00
grossmj
dfd6af3c22 Merge remote-tracking branch 'origin/unstable' into unstable 2015-07-19 22:55:27 -06:00
grossmj
1f890b4cad Implements uBridge hypervisor. 2015-07-19 22:55:10 -06:00
Julien Duponchelle
639f6bc68c New crash report key 2015-07-18 22:17:14 +02:00
Julien Duponchelle
5125ddcde4 Fix gns3server.utils.images in md5sum NameError: name 'log' is not
Fix #268
2015-07-16 18:56:36 +02:00
Julien Duponchelle
ddddac426b Fix invalid umask
Fix #264
2015-07-15 13:58:08 +02:00
Julien Duponchelle
6d678898ef Client disconnect should not be logged as an error 2015-07-13 14:51:42 +02:00
Jeremy
ccd29ab500 Take VMware file encoding into account. Fixes #261. 2015-07-12 20:58:58 -06:00
Jeremy
f08817f335 Merge remote-tracking branch 'origin/unstable' into unstable 2015-07-12 19:03:22 -06:00
Jeremy
e785baaa29 Take VMware file encoding into account. Fixes #261. 2015-07-12 19:03:15 -06:00
grossmj
6048222797 Adjust AUTHORS. 2015-07-12 17:25:03 -06:00
Julien Duponchelle
9e2a22fc8e 1.4.0dev2 2015-07-10 15:52:53 +02:00
Julien Duponchelle
9cfc7c0423 Typo in version number 2015-07-09 19:05:47 +02:00
Julien Duponchelle
65410e23e2 1.4.0 alpha1 2015-07-09 19:05:12 +02:00
grossmj
1e04e1e123 Fixes bug with vmrun VIX path. 2015-07-09 10:32:23 -06:00
Julien Duponchelle
f2e5b8756a Changelog for 1.4.0 alpha1
Fix #260
2015-07-09 17:48:02 +02:00
Julien Duponchelle
5705ace70c Update documentation 2015-07-09 16:16:43 +02:00
Julien Duponchelle
c3eb6a440f Fix vmware and interfaces tests 2015-07-09 16:12:33 +02:00
Julien Duponchelle
a461cb71c6 Allow to send the iourc when starting the VM
Ref https://github.com/GNS3/gns3-server/issues/255
2015-07-09 16:06:52 +02:00
Julien Duponchelle
dd6c377b15 Fix test on Linux
Fix #258
2015-07-09 15:39:14 +02:00
grossmj
2fc63601bf Merge remote-tracking branch 'origin/unstable' into unstable 2015-07-08 21:39:14 -06:00
grossmj
27532cd037 Add debug to help resolve https://community.gns3.com/thread/9193 2015-07-08 21:38:58 -06:00
Jeremy
32e0d49e1e VMware VMs always have a working directory (to store the ubrige.ini and ubrige.log files). 2015-07-08 17:48:34 -06:00