arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 08:48:11 +00:00
Code Issues Releases Wiki Activity
1,479 Commits 5 Branches 205 Tags 155 MiB
9737783eb6
Commit Graph

1203 Commits

Author SHA1 Message Date
Jeremy
870029123c Netifaces is not used on Windows. Fixes #257. 2015-07-08 14:51:21 -06:00
Jeremy
37f4ff2f63 Do not monitor the ubridge process because it creates an issue on Windows. 2015-07-08 13:00:54 -06:00
grossmj
8455d8a155 Merge remote-tracking branch 'origin/unstable' into unstable 2015-07-07 12:48:31 -06:00
grossmj
205f624730 Fixes GUI crash on unset vmrun_path variable. Fixes #507. 2015-07-07 07:58:48 -06:00
Jeremy
78d847e9ac ubridge source Ethernet interface must be quoted on Windows. 2015-07-06 18:32:01 -06:00
Julien Duponchelle
dfe95cce63 Fix qemu binary lookup in frozen OSX application 
https://github.com/GNS3/gns3-gui/issues/496
 2015-07-05 21:53:47 +02:00
Jeremy
83929119be Return stdout when a process crash for IOU, Dynamips, uBridge and VPCS. 2015-07-04 14:08:03 -06:00
Jeremy
9235c3a913 Adds -no-kvm to the ASA template and ignore -no-kvm on platforms other than Linux. Should resolve #472. 2015-07-03 23:35:42 -06:00
Jeremy
442aa31065 Make sure VNC ports are between 5900 and 6000. Fixes #490. 2015-07-03 16:06:25 -06:00
Jeremy
8e652778f9 Remove running VBoxManage as another user option (root for instance). See #248. 2015-07-03 14:37:07 -06:00
Julien Duponchelle
65953847f6 Fix an error in frozen ressources loading 2015-07-03 20:29:49 +02:00
Julien Duponchelle
f3f152cd2a Use the ressource system in order to locate the templates directory 2015-07-03 20:03:37 +02:00
Julien Duponchelle
c6bbc34a56 Allow user to change the configuration file 
Fix #251
 2015-07-03 11:10:12 +02:00
Julien Duponchelle
06e193231c Fix double loading of config from working directory 2015-07-03 10:53:41 +02:00
Jeremy
731d24f497 Get Windows interfaces for VMware support. 2015-07-02 20:10:20 -06:00
Julien Duponchelle
3ed95148b2 CORS support 2015-07-02 19:12:55 +02:00
Julien Duponchelle
caf7af7ad5 Support server config in current working directory 2015-07-01 17:30:52 +02:00
Julien Duponchelle
472faa97c5 Due to the migration to cx_freeze darwin and windows share 
the same path for resources
 2015-07-01 17:25:53 +02:00
grossmj
4171aebfdb List only valid existing IOS images (for IOS router wizard). 2015-06-30 17:37:46 -06:00
Jeremy
be85d95ff7 Checks if IOS image exist at startup and not during node creation. Fixes #240. 2015-06-29 16:30:57 -06:00
Julien Duponchelle
6e3ebb714d Return vm_directory for VirtualBox and VMware 
Fix #246
 2015-06-26 17:09:19 +02:00
Julien Duponchelle
feefb075d4 Make the qemu event crash more future proof 2015-06-26 15:10:41 +02:00
Julien Duponchelle
90b0dfebbd Merge branch 'master' into unstable 2015-06-26 14:42:43 +02:00
Julien Duponchelle
e8805d3fdc When a qemu VM crash send the log to the client. 
Fix #243
 2015-06-26 14:41:58 +02:00
Julien Duponchelle
2ccb30eeb5 Fix Incorrect vboxmanage sudo command 
Fix #247
 2015-06-26 10:47:52 +02:00
Julien Duponchelle
ccd3224490 Add a vm_directory field to Dynamips / VPCS / IOU 
Fix #246
 2015-06-25 11:17:32 +02:00
Julien Duponchelle
2b36746d52 Return the working directory of a Qemu VM 2015-06-25 09:53:16 +02:00
grossmj
d9745644cd Check for /dev/kvm. Fixes #245. 2015-06-24 23:03:04 -06:00
grossmj
ed95bcee97 Moves KVM setting to Qemu server preferences. Fixes #244. 2015-06-24 22:47:30 -06:00
grossmj
f20ee06181 VNC console support for Qemu VMs. 2015-06-24 19:09:17 -06:00
Julien Duponchelle
26df776f4c Move configuration to the GNS3 directory 2015-06-24 11:57:42 +02:00
Julien Duponchelle
08b5aec656 Fix Crash report sending errors when no reliable Internet connection 2015-06-23 19:28:08 +02:00
grossmj
7f6a064ac1 Fixes versions. 2015-06-23 07:34:25 -06:00
Julien Duponchelle
3a3b2c22e3 Fix version number 2015-06-23 10:24:19 +02:00
Julien Duponchelle
82e2a16b27 Merge branch 'master' into unstable 2015-06-23 09:47:01 +02:00
Julien Duponchelle
389788cfdc 1.3.8 dev 2015-06-22 20:19:38 +02:00
Julien Duponchelle
26fc8236c9 1.3.7 2015-06-22 19:06:25 +02:00
Julien Duponchelle
8bd2453bf8 Allow null md5 in request schema 2015-06-19 16:38:22 +02:00
Julien Duponchelle
a8e69d9a0b Do not use the md5 from cache for a missing image 2015-06-19 16:36:25 +02:00
Julien Duponchelle
4aadfa3b67 Test all IOU requirements at VM startup 
This allow user to create the node and upload the image after
 2015-06-19 16:35:19 +02:00
Julien Duponchelle
5c4a49a8c7 Do not raise a 404 if we send the checksum of the images 2015-06-19 16:18:43 +02:00
Jeremy
f398d15025 Completes #239 (Makes VMX keys reading case insensitive). 2015-06-18 17:53:08 -06:00
Jeremy Grossmann
797b45b1f9 Merge pull request #239 from GNS3/vmx_case_insensitive 
Makes VMX keys reading case insensitive.
 2015-06-18 14:08:40 -07:00
Jeremy
11e96e6521 ACPI shutdown support for VMware VMs. Fixes #436. 2015-06-18 15:02:31 -06:00
Julien Duponchelle
a577fe9fdb Make VMX reading case insensitive 
Fix #237
 2015-06-18 16:28:13 +02:00
Jeremy
6d1f060791 Reloads ubridge when connecting or disconnecting VMware VM links. 2015-06-17 17:36:52 -06:00
Jeremy
d779392d7f Find vmrun on Windows. 2015-06-17 17:05:58 -06:00
Julien Duponchelle
f041697311 Compute a md5sum of images for futur purpose 
Fix #234
 2015-06-17 17:11:25 +02:00
Julien Duponchelle
b1f740c952 Merge branch 'master' into unstable 2015-06-17 14:09:32 +02:00
Julien Duponchelle
afa4ba9b55 Crash report key for 1.3.7 2015-06-17 09:30:56 +02:00
grossmj
7980ae9ab1 Update version_info. 2015-06-16 15:00:25 -06:00
grossmj
3495035dbf Bump version to 1.3.7.dev1 2015-06-16 14:39:20 -06:00
Julien Duponchelle
a2d4c2427d 1.3.6 2015-06-16 21:56:44 +02:00
Julien Duponchelle
0dae4b6930 1.3.6dev1 2015-06-16 19:32:53 +02:00
Julien Duponchelle
d88c5648de 1.3.5 2015-06-16 18:56:50 +02:00
Julien Duponchelle
94fbd3fac9 Ignore invalid characters when reading the output of a process 
It should happend only when user try to use another binary and
the code of VPCS, dynamips... Will detect it's not the
correct binary.

For example we detect this error after an user used SupperPutty
instead of VPCS.

Fix #235
 2015-06-16 15:48:59 +02:00
Julien Duponchelle
e2ef78a7c4 Ignore invalid characters when reading the output of a process 
It should happend only when user try to use another binary and
the code of VPCS, dynamips... Will detect it's not the
correct binary.

For example we detect this error after an user used SupperPutty
instead of VPCS.

Fix #235
 2015-06-16 15:48:09 +02:00
grossmj
8bcf749cd5 Adds an IP address for each interface returned by the interfaces API method. 2015-06-12 17:54:02 -06:00
Julien Duponchelle
f39f7be503 Add log when we didn't close a project due to another client 2015-06-12 15:14:30 +02:00
Julien Duponchelle
4e16433a08 Limit file size during upload 
Fix #86
 2015-06-12 10:10:46 +02:00
Julien Duponchelle
04aac2f3dc Convert old -enable-kvm to kvm settings for Qemu 
Fix #233
 2015-06-12 09:40:38 +02:00
Julien Duponchelle
6e88ba4c25 Cleanup SSL certificate support 
Fix #208
 2015-06-11 17:07:13 +02:00
Julien Duponchelle
04e62e429c Merge branch 'master' into unstable 2015-06-11 16:55:09 +02:00
Julien Duponchelle
a2833cf276 Turn on / off authentication 2015-06-10 23:14:18 +02:00
Julien Duponchelle
75267f9d53 Merge branch 'master' into unstable 2015-06-10 16:30:30 +02:00
Julien Duponchelle
2da0b36ee7 Support a platform parameter for Qemu 
I'm sure we will discover a distribution with a different
naming conventions...

Fix #220
 2015-06-10 15:49:24 +02:00
Julien Duponchelle
b36c5f25d2 Improve memory consumption of file upload with the HTML form 
Fix #86
 2015-06-10 14:20:06 +02:00
Julien Duponchelle
7c7f8fe3ed Fix ethernet interfaces tests if eth0 doesn't exists 
Also on Windows and MacOS it return error if we try
to use a non existing interfaces.

Fix #230
 2015-06-09 16:35:21 +02:00
Julien Duponchelle
bd4b6396a8 Ensure in test we didn't load the local configuration 2015-06-09 16:32:36 +02:00
Julien Duponchelle
36d5049c61 More debug for the interfaces up crash debug 2015-06-09 10:10:06 +02:00
Julien Duponchelle
079715bc18 Ensure no colored output on Windows 
Fix #228
 2015-06-09 10:05:00 +02:00
grossmj
d518ac45f5 Enable KVM acceleration option. 2015-06-08 14:51:06 -06:00
grossmj
c7ea8517a1 Do not stop saving IOS router or IOU configs when there is an exception while a project is committed. 2015-06-08 11:32:00 -06:00
grossmj
5a32d8a779 Merge remote-tracking branch 'origin/master' 2015-06-08 11:28:58 -06:00
grossmj
9f1705a4f1 Do not stop saving IOS router configs when there is an exception while a project is committed. 2015-06-08 11:28:48 -06:00
grossmj
815b7d226c Sync with IOU tools (nvram import/export). 2015-06-08 10:07:54 -06:00
grossmj
65e7f61f96 Fixes issues when setting MAC address for a Qemu VM or IOS router. 2015-06-07 22:18:41 -06:00
grossmj
042472f02c Check interface is up before connecting a NIO (Linux only). Fixes #277. 2015-06-07 13:51:33 -06:00
grossmj
81d417a2b3 Fixes too many arguments to socket.getaddrinfo() 2015-06-07 09:25:54 -06:00
grossmj
81e56e035b IPv6 support. 2015-06-06 21:37:34 -06:00
grossmj
ca331ae2a5 Import/Export support for IOU nvrams. 2015-06-06 15:15:03 -06:00
grossmj
e63b9ff0e6 Option to drop nvram & disk files for IOS routers in order to save disk space. 2015-06-05 14:54:22 -06:00
Julien Duponchelle
02650fa490 Create a private config file if expected 
Fix #217
 2015-06-05 16:23:52 +02:00
Julien Duponchelle
d9de1718b7 Fix crash if a private config exist in IOS but no private config file 
Fix #217
 2015-06-05 15:30:30 +02:00
grossmj
b118f9a078 Replace RuntimeError by SystemExit. 2015-06-03 19:58:58 -06:00
grossmj
37ddff9f07 Support for base MAC address for Qemu VMs. 2015-06-03 14:52:49 -06:00
grossmj
9f15fdbc2b Fixes #181 (drop Python 3.3). 2015-06-03 12:08:11 -06:00
Julien Duponchelle
d8fb33dba2 Fix merge conflict 2015-06-03 18:58:17 +02:00
Julien Duponchelle
a1204dca0a Merge branch 'master' into unstable 2015-06-03 18:34:46 +02:00
Julien Duponchelle
78891ae00e Basic Auth support 2015-06-03 15:38:34 +02:00
Julien Duponchelle
b344def887 Fix crash when virtualbox list of VMS return an empty line 
Fix #206
 2015-06-03 11:59:53 +02:00
grossmj
743f1392b5 ACPI shutdown support for Qemu VMs. 2015-06-02 22:33:38 -06:00
grossmj
933bc5a7b0 ACPI shutdown support for VirtualBox VMs. 2015-06-02 16:30:35 -06:00
Julien Duponchelle
a1bc815f63 Update crash report key 2015-06-02 20:27:33 +02:00
Julien Duponchelle
668cc3f0a5 1.3.5dev1 2015-06-02 20:05:31 +02:00
Julien Duponchelle
42a8c7147a 1.3.4 release 2015-06-02 19:48:04 +02:00
grossmj
a0fe9bb498 Control vm command has to be used instead of modify vm. Fixes #205. 2015-06-02 09:00:37 -06:00
Julien Duponchelle
57f9d875ca Fix AttributeError: 'NIONAT' object has no attribute 'lport' for 
VirtualBox

Fix #205
 2015-06-02 16:27:48 +02:00
Julien Duponchelle
a2e51ac090 Avoid duplicate paths in qemu binary list 
Fix #204
 2015-06-02 15:35:14 +02:00
grossmj
edff447483 Catch exception in snapshot dialog. 2015-06-01 21:54:08 -06:00
Jeremy
ad27fdf8b9 Bump version to 1.3.4.dev2 2015-06-01 16:29:49 -06:00
Jeremy
9df290f192 Check if port or adapter is connected before starting/stopping a packet capture. Fixes #196. 2015-06-01 15:42:17 -06:00
Julien Duponchelle
05aafb9538 Revert "Start virtualbox VM one by one" because it doesn't fix the issue 
This reverts commit da72a9501a.
 2015-06-01 16:16:34 +02:00
Julien Duponchelle
da72a9501a Start virtualbox VM one by one 
Related to #190
 2015-06-01 11:40:42 +02:00
grossmj
a60389427b Support for VMware linked clones. 2015-05-30 20:26:38 -06:00
Julien Duponchelle
ada94d486a Get server resource independant of working directory 2015-05-28 13:24:45 +02:00
Julien Duponchelle
85c185604e Merge branch 'master' into unstable 2015-05-28 12:18:24 +02:00
Julien Duponchelle
a2dfeab315 Load faulthandler module only for dev build 2015-05-28 12:17:56 +02:00
Julien Duponchelle
16cad8426a Enable faulthandler only for dev build 2015-05-28 12:17:25 +02:00
Julien Duponchelle
9442042d7a Merge branch 'master' into unstable 2015-05-28 12:04:01 +02:00
Julien Duponchelle
57a069b027 Support cacert.pem in the new frozen package 2015-05-28 11:31:23 +02:00
grossmj
98e01ff21d Serial console implementation for VMware VMs. 2015-05-27 21:06:18 -06:00
Vasil Rangelov
9ef4628cbc Added a method for getting qemu-img binaries, and moved the qemu folder into a separate method. 2015-05-28 00:11:36 +03:00
grossmj
0476f2932e Prevent users to add links to running Qemu VMs and start a capture on running VirtualBox VMs. 2015-05-27 13:56:27 -06:00
grossmj
91c0f05a4e Fixes bug: couldn't set PCMCIA disk1 size for IOS routers. 2015-05-27 10:17:46 -06:00
Julien Duponchelle
74ee73581a Fix crash if you pass an invalid hostname 
Fix #198
 2015-05-27 17:34:01 +02:00
Julien Duponchelle
a86bac4214 Catch VPCS kill errors 
Fix #199
 2015-05-27 17:21:15 +02:00
Julien Duponchelle
7cad25eb1a Raise a VirtualBox error if adapter doesn't exists 
Fix #195
 2015-05-27 16:38:57 +02:00
Julien Duponchelle
ecf4e91e55 Ignore VirtualBox VM Name with a carriage return in name 
Add tests for get_list of VirtualBox

Fix #200
 2015-05-27 16:21:18 +02:00
Julien Duponchelle
c98bcedd39 Cleanup the temporary project after modules have been notified of the 
path change
 2015-05-26 15:20:14 +02:00
Julien Duponchelle
528bb7a7c6 Do not return error if we can't remove the old project directory 2015-05-26 13:27:12 +02:00
Julien Duponchelle
50d7a4f335 Catch encoding errors in windows logger 2015-05-26 13:05:37 +02:00
Julien Duponchelle
f1ab682be9 Do not crash if module ioucon is loaded by tests on Windows 2015-05-26 11:55:30 +02:00
Julien Duponchelle
289b68e5c1 Use setter for the qemu_path (allow to pass only the binary name) 2015-05-26 10:06:10 +02:00
grossmj
a7dd0d3c51 Fixes TAP connection when using VPCS. 2015-05-26 10:06:10 +02:00
Julien Duponchelle
29ec07d166 Fix crash launching qemu on OSX from another location. 
It's append only when frozen an you launch the server by hand.

Fix #194
 2015-05-26 10:05:53 +02:00
Julien Duponchelle
b62efa3bae I'm stupid... Remove fake segfault 2015-05-26 10:05:53 +02:00
Julien Duponchelle
c5171b887f Add the fault handler in order to try to get a proper crash stack 2015-05-26 10:05:21 +02:00
grossmj
f169455ad4 Adds NAT NIO in device schema validation so they can return an error that it is not supported. 2015-05-26 10:04:22 +02:00
Julien Duponchelle
6f9f004ebb API for list & download files of a project 2015-05-26 09:49:12 +02:00
Julien Duponchelle
8636d3e337 Use setter for the qemu_path (allow to pass only the binary name) 2015-05-26 09:48:36 +02:00
grossmj
c43b26d787 Merge remote-tracking branch 'origin/master' 2015-05-25 19:07:23 -06:00
grossmj
08f82e02a0 Fixes TAP connection when using VPCS. 2015-05-25 19:07:12 -06:00
grossmj
3c4a60cd0a Check for VMware lock file. 2015-05-25 15:49:28 -06:00
grossmj
3729a10783 VMware vmnets management almost complete. 2015-05-21 21:48:59 -06:00
Jeremy
0287b4607d Base for supporting VMnet adapters. 2015-05-20 19:05:26 -06:00
Julien Duponchelle
9fa873751d Fix crash launching qemu on OSX from another location. 
It's append only when frozen an you launch the server by hand.

Fix #194
 2015-05-18 11:58:56 +02:00
Julien Duponchelle
8c9758d16b I'm stupid... Remove fake segfault 2015-05-17 23:10:50 +02:00
Julien Duponchelle
0c5b753211 Add the fault handler in order to try to get a proper crash stack 2015-05-17 12:47:04 +02:00
Jeremy
cb7b9e8190 Adapters for VMware VMs. 2015-05-15 19:09:48 -06:00
grossmj
221a35baae Adds NAT NIO in device schema validation so they can return an error that it is not supported. 2015-05-14 20:54:38 -06:00
grossmj
0ac27c40da Merge remote-tracking branch 'origin/unstable' into unstable 2015-05-14 20:12:08 -06:00
grossmj
a386c5382c Starting VMware VM networking support. 2015-05-14 20:11:57 -06:00
Julien Duponchelle
743187bb2e Merge branch 'master' into unstable 2015-05-14 19:29:30 +02:00
Julien Duponchelle
5bb870dc0f New crash report key 2015-05-14 19:28:26 +02:00
Julien Duponchelle
76be91d544 1.3.4dev1 2015-05-14 19:23:21 +02:00
Julien Duponchelle
078b72cafd Version 1.3.3 2015-05-14 18:57:30 +02:00
Jeremy
b2457e0b3b Check for empty iourc path. 2015-05-13 16:05:54 -06:00
Jeremy
2531a05adc Merge remote-tracking branch 'origin/master' 2015-05-13 15:54:03 -06:00
Jeremy
dd9f62158f Fixes bugs with IOS router configs. Fixes #354. 2015-05-13 15:53:58 -06:00
Julien Duponchelle
a3c0f0754e Fix crash 2015-05-13 23:27:51 +02:00
Jeremy
25a6616cd0 Some wording changes. 2015-05-13 13:53:42 -06:00
Julien Duponchelle
157bc18ebd Use a temporary directory as egg cache 
We have use with broken permission on their
system. We try to workaround the issue.

Fix #182
 2015-05-13 14:29:03 +02:00
Julien Duponchelle
1e38b11f34 Catch crash error in IOU in case of permission denied 
Fix #186
 2015-05-13 10:16:24 +02:00
grossmj
8e168dfbe0 Completes VMware VMs searching process. 2015-05-10 17:21:31 -06:00
Julien Duponchelle
bb4ebbfe64 Upload images API 
Conflicts:
	requirements.txt
	setup.py
 2015-05-10 21:06:31 +02:00
Jeremy Grossmann
61fb641215 Merge pull request #168 from GNS3/listen 
A notification stream with process monitoring.
 2015-05-09 17:15:58 -06:00
grossmj
13eb461dfe Update default VMware VM location path for OSX. 2015-05-08 18:30:41 -06:00
Julien Duponchelle
00fa1cc370 Merge branch 'master' into unstable 2015-05-08 14:45:07 +02:00
Jeremy
c197b39a68 Find VMware VMs using the inventory and alternatively using the default vm location (for VMware player). 2015-05-07 16:50:37 -06:00
Jeremy
bebdadc465 Bump version to 1.3.3.dev3 2015-05-07 11:52:17 -06:00
Julien Duponchelle
b0ce091a4c 1.3.3rc1 2015-05-07 16:03:51 +02:00
Jeremy
d21469a916 Return an error if an adapter slot doesn't exist on an IOS router. 2015-05-06 17:22:07 -06:00
Jeremy
b57a023394 NIO NAT support for VirtualBox VMs. 2015-05-06 15:21:39 -06:00
grossmj
a929dfea38 Merge remote-tracking branch 'origin/master' 2015-05-06 14:59:35 -06:00
grossmj
fcff2d0813 NIO NAT support for QEMU VMs (user mode back-end is used). 2015-05-06 14:59:01 -06:00
Julien Duponchelle
ed39afbf3d Throw an error if user put an invalid port range in config file 
Fix #117
 2015-05-06 10:40:51 +02:00
Julien Duponchelle
3ba4789ba6 New crash report key 
Fix #180
 2015-05-06 09:55:14 +02:00
grossmj
17b93e6a89 Bump version to 1.3.3dev2 2015-05-05 14:49:03 -06:00
Julien Duponchelle
4b21135ba7 Turn off configuration parser interpolation 2015-05-05 11:53:33 +02:00
Julien Duponchelle
a3f00e1f45 Catch configuration file parsing errors 
Fix #176
 2015-05-05 11:44:35 +02:00
Julien Duponchelle
b7dac1bec4 Force closing the event loop to avoid warning with Python 3.4.3 
Fix #177
 2015-05-05 11:33:47 +02:00
Julien Duponchelle
18c4154376 Catch error when you can't mark a project as no longer temporary 
Fix #172
 2015-05-05 10:51:51 +02:00
Julien Duponchelle
22efc7488f Catch BrokenPipeError for OSX frozen server 
Fix #166
 2015-05-05 10:46:09 +02:00
grossmj
9eeb8910fb Match how IOU initial-config is set for VPCS VM. 2015-05-04 21:54:56 -06:00
Jeremy
71e2586e17 Refactors how startup-config and private-config are handled for IOS routers. 2015-05-04 18:42:32 -06:00
Jeremy
c4054cf810 Catch the "WinError 0 The operation completed successfully" exception at a higher level. 2015-05-04 12:14:04 -06:00
Julien Duponchelle
d2d91ebdea Fix temporary project not cleanup with save as 2015-05-04 14:04:57 +02:00
Julien Duponchelle
0dea63c9ea If image is not found in VM directory look in images folder 2015-05-04 10:57:08 +02:00
grossmj
3467b42ab5 Ordered MAC addresses for QEMU based VMs. 2015-05-03 13:18:18 -06:00
grossmj
65103e9332 Merge remote-tracking branch 'origin/master' 2015-05-03 11:41:09 -06:00
grossmj
f6bc823b58 Fixes #171. 2015-05-03 11:40:55 -06:00
grossmj
a260377f0e List all available VMware VMs. 2015-05-01 18:47:46 -06:00
Julien Duponchelle
151788e48a Force utf-8 configuraton files reading 
Fix #170
 2015-05-01 17:49:16 +02:00
Julien Duponchelle
e9ec5c8a37 A notification stream with process monitoring 2015-05-01 13:20:30 +02:00
Julien Duponchelle
57f5e7a7d9 Merge branch 'master' into unstable 2015-05-01 13:20:09 +02:00
Julien Duponchelle
6b70fa9794 Do not list file starting with a . in upload handler 2015-05-01 10:55:08 +02:00
Jeremy
ab60d7929b Basic VMware support (start & stop a VM). 2015-04-30 19:05:37 -06:00
Julien Duponchelle
359abb0286 Revert "Merge branch 'unstable'" 
This reverts commit 929c337e8b, reversing
changes made to b9bc73fd01.
 2015-04-30 16:43:30 +02:00
grossmj
d18293ae7c Fixes list images in VirtualBox. 2015-04-29 22:17:17 -06:00
Jeremy
929c337e8b Merge branch 'unstable' 
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
	tests/modules/test_manager.py
 2015-04-29 16:29:45 -06:00
Julien Duponchelle
f8f6f5dc5d Merge branch 'master' into unstable 
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
 2015-04-29 14:25:44 +02:00
Julien Duponchelle
b9bc73fd01 Do not crash when closing a project if VirtualBox is not accessible 
Fix #164
 2015-04-29 14:24:27 +02:00
Julien Duponchelle
e75fbc9d73 Catch connection reset errors 
Fix #162
 2015-04-29 11:15:32 +02:00
grossmj
0311a0086e Fixes typo. 2015-04-28 22:16:15 -06:00
Julien Duponchelle
461e3ce53f 1.3.3dev1 2015-04-28 21:49:48 +02:00
Julien Duponchelle
1b4613fbaf Version 1.3.2 2015-04-28 21:06:04 +02:00
grossmj
cc03017739 Cleanup the VirtualBox Media Manager after closing a project. Fixes #145. 2015-04-28 12:02:21 -06:00
Julien Duponchelle
5f6d1bfdd6 Merge branch 'master' into unstable 
Conflicts:
	tests/modules/test_manager.py
 2015-04-28 10:46:59 +02:00
grossmj
a884af983f Avoid Cygwin warning with VPCS on Windows. 2015-04-27 22:23:27 -06:00