ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-19 12:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,159 Commits 5 Branches 204 Tags 76 MiB
9442042d7a
Commit Graph

1159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Duponchelle
57f5e7a7d9 Merge branch 'master' into unstable 2015-05-01 13:20:09 +02:00
Julien Duponchelle
c3c6b29854 Merge commit '359abb0286fe25d60ac2155bbed869d068a15868' into unstable 2015-05-01 13:18:17 +02:00
Julien Duponchelle
827d04bed4 Merge commit 'd18293ae7c54684aba101ca3931f2331b8ea050e' into unstable 
Second master to unstable bad merge commit
 2015-05-01 11:57:14 +02:00
Julien Duponchelle
ba658a4712 Merge commit '929c337e8bf33f060c884368628b279550248925' into unstable 
It's the bad unstable => master commit
 2015-05-01 11:56:19 +02:00
Julien Duponchelle
b3f2a6ac2a Fix tests and build documentation 2015-05-01 11:24:56 +02:00
Julien Duponchelle
e6eab1fb25 Aiohttp 0.15.1 
Conflicts:
	requirements.txt
	setup.py
 2015-05-01 10:57:28 +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
30ff5510d9 Merge remote-tracking branch 'origin/master' 2015-04-28 12:02:33 -06:00
grossmj
cc03017739 Cleanup the VirtualBox Media Manager after closing a project. Fixes #145. 2015-04-28 12:02:21 -06:00
Julien Duponchelle
bad740d32a Fix test on Linux 2015-04-28 15:31:00 +02: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
Jeremy Grossmann
4f021054e0 Merge pull request #158 from GNS3/keep_iou_config 
Do not erase the IOU initial-config if there is one when creating the IOU VM.
 2015-04-27 18:37:17 -06:00
Jeremy
8503472c77 Close VirtualBox VM linked clone disks after the VM is unregistered. Fixes #145. 2015-04-27 17:10:32 -06:00
Julien Duponchelle
e7ae1776f4 Final fixes for windows test suite 2015-04-27 23:28:12 +02:00
Julien Duponchelle
3f26ada081 Comment broken test 2015-04-27 23:20:01 +02:00
Julien Duponchelle
77f54848e3 Fix some tests on Windows 2015-04-27 23:12:13 +02:00
Julien Duponchelle
bf3444933e Fix test qemu now raise 409 if nio_ethernet 2015-04-27 22:54:24 +02:00
Jeremy
f208b472a1 TAP interface support for QEMU VMs. Fixes #153. 2015-04-27 14:38:15 -06:00
Jeremy
b6a935aeb8 Return an explicit error when a NIO type is not supported by a VM. 2015-04-27 14:19:17 -06:00
Julien Duponchelle
324a4f73d0 Do not erase the IOU config 2015-04-27 18:22:54 +02:00
Julien Duponchelle
d5ae4750e9 Do not load IOU handler on Windows during tests 
Fix #159
 2015-04-27 16:21:56 +02:00
Julien Duponchelle
4df95efdec Skip IOU test on Windows 
Fix #159
 2015-04-27 15:09:42 +02:00
Julien Duponchelle
834a554fea Fix VPCS tests 2015-04-27 10:14:46 +02:00
grossmj
271cb527d4 Explicit utf-8 decoding. 2015-04-26 21:19:39 -06:00
grossmj
6edf1e3649 Check NIO exists when stopping an IOU capture. 2015-04-26 21:15:15 -06:00
grossmj
017997e0a3 Fixes c7200 NPE setting. 2015-04-26 18:35:12 -06:00
grossmj
3e6996903f Fixes VPCS process termination. 2015-04-26 12:57:06 -06:00
grossmj
da2b895c99 Catch FileNotFoundError exception in os.getcwd() 2015-04-26 12:49:29 -06:00
grossmj
683a512917 Fixes #150. 2015-04-25 15:20:15 -06:00
grossmj
80a0e0ebf7 Explicit utf-8 encoding where necessary to avoid Unicode errors on Windows (we require/set an utf-8 locale on other systems). 2015-04-25 11:58:34 -06:00
grossmj
d68bf1c263 Removes unnecessary sleep in VirtualBox VM. 2015-04-25 09:36:28 -06:00
Jeremy
fa544ef888 Fixes #270. Relative paths management with empty ones. 2015-04-24 17:27:32 -06:00
Jeremy Grossmann
ee1e5b8204 Merge pull request #156 from GNS3/daemon 
Server daemonization support.
 2015-04-24 16:38:59 -06:00
Jeremy
8f6e5b4ad8 Merge branch 'unstable' into daemon 
Conflicts:
	gns3server/main.py
 2015-04-24 16:37:56 -06:00
Julien Duponchelle
24bfd8ab53 New crash report key and doesn't send report for developers 2015-04-24 18:30:31 +02:00
Jeremy Grossmann
14cc01bb8b Merge pull request #152 from GNS3/api_list_images 
API in order to get the list of IOU, Dynamips, Qemu images.
 2015-04-23 17:20:15 -06:00
Jeremy
40ce22222e Merge branch 'unstable' into api_list_images 
Conflicts:
	gns3server/handlers/api/iou_handler.py
 2015-04-23 17:19:37 -06:00
Jeremy Grossmann
7e991cc404 Merge pull request #154 from GNS3/wireshark_remote_capture 
Support for Wireshark remote packet captures.
 2015-04-23 16:17:44 -06:00
Julien Duponchelle
83f2509cfe Cleanup exceptions 2015-04-23 16:56:46 +02:00