Jeremy
|
11ee72ddf3
|
Merge branch 'unstable' of github.com:GNS3/gns3-server into unstable
Conflicts:
tests/modules/vpcs/test_vpcs_vm.py
|
2015-04-29 16:33:24 -06:00 |
|
Jeremy
|
3b3ddeb435
|
Merge branch 'unstable' into listen_notification
Conflicts:
gns3server/modules/iou/iou_vm.py
gns3server/modules/qemu/qemu_vm.py
gns3server/utils/asyncio.py
|
2015-04-29 16:07:19 -06:00 |
|
Jeremy
|
6fc7d014c3
|
Some wording changes.
|
2015-04-29 15:10:42 -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 |
|
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
|
77f54848e3
|
Fix some tests on Windows
|
2015-04-27 23:12:13 +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 |
|
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
|
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
|
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 |
|
Julien Duponchelle
|
6b862b8397
|
Correctly show the host in templates
Fix #157
|
2015-04-23 14:32:10 +02:00 |
|
Julien Duponchelle
|
fac0f5ecd9
|
Proper daemon support
|
2015-04-23 11:10:02 +02:00 |
|
grossmj
|
3680c40e23
|
Catch COM errors when connecting to WMI.
|
2015-04-23 00:03:44 -06:00 |
|
grossmj
|
30f6263146
|
Don't assume the PATH environment variable exists.
|
2015-04-22 21:42:36 -06:00 |
|
grossmj
|
161adb781b
|
Use UUIDs instead of the VM names for VirtualBox pipe paths.
|
2015-04-22 20:29:52 -06:00 |
|
Julien Duponchelle
|
2e39265da1
|
Merge branch 'master' into unstable
|
2015-04-22 17:34:17 +02:00 |
|
Julien Duponchelle
|
9c549b175f
|
Add --log options for daemon support
|
2015-04-22 17:28:58 +02:00 |
|
Julien Duponchelle
|
bf618d321c
|
Max 100 thread executor
|
2015-04-22 10:39:43 +02:00 |
|
Julien Duponchelle
|
8b879c0614
|
Support wireshark remote capture
|
2015-04-20 19:27:07 +02:00 |
|
Julien Duponchelle
|
cf0adf56a8
|
Merge branch 'master' into unstable
|
2015-04-20 19:26:27 +02:00 |
|
Julien Duponchelle
|
531e95463c
|
Add qemu-kvm to the list of binary
|
2015-04-20 10:12:17 +02:00 |
|
Julien Duponchelle
|
3926390d30
|
Fix tests broken by a previous commit
|
2015-04-18 09:22:37 +02:00 |
|
grossmj
|
343e007809
|
Ignore the "OSError: [WinError 0] The operation completed successfully" exception in Windows.
|
2015-04-16 20:17:06 -06:00 |
|
grossmj
|
c6dbf296cf
|
Merge remote-tracking branch 'origin/master'
|
2015-04-16 13:24:48 -06:00 |
|
Julien Duponchelle
|
dfdc18b20c
|
Merge branch 'master' into unstable
|
2015-04-16 18:38:59 +02:00 |
|
Julien Duponchelle
|
bca90bc563
|
API in order to get the list of IOU, Dynamips, Qemu images
|
2015-04-16 18:32:12 +02:00 |
|