grossmj
|
33e8710495
|
Merge branch '2.1' into 2.2
# Conflicts:
# gns3server/compute/docker/docker_vm.py
# gns3server/controller/compute.py
# gns3server/controller/gns3vm/__init__.py
# gns3server/controller/link.py
# gns3server/controller/project.py
# gns3server/handlers/api/controller/project_handler.py
# gns3server/handlers/api/controller/server_handler.py
# gns3server/utils/asyncio/__init__.py
# gns3server/utils/asyncio/telnet_server.py
# gns3server/version.py
# gns3server/web/web_server.py
# tests/compute/qemu/test_qemu_vm.py
|
2018-08-29 15:57:54 +07:00 |
|
grossmj
|
902de3dd47
|
Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568
|
2018-08-25 14:10:47 +07:00 |
|
grossmj
|
21a1800edc
|
Merge branch '2.1' into 2.2
# Conflicts:
# gns3server/controller/__init__.py
# gns3server/controller/export_project.py
# gns3server/controller/import_project.py
# gns3server/controller/project.py
# gns3server/version.py
|
2018-04-28 19:41:12 +07:00 |
|
grossmj
|
202e7362a5
|
Add command information when uBridge has an error. Ref #1289
|
2018-04-28 18:48:52 +07:00 |
|
grossmj
|
b8353bc0d5
|
Support for none console type (Qemu & Docker only)
|
2018-03-23 15:44:16 +07:00 |
|
grossmj
|
658aa4bae9
|
Merge 2.1 into 2.2 branch
|
2018-03-12 13:38:50 +07:00 |
|
grossmj
|
00e781826b
|
Different approach to handle no data returned by uBridge hypervisors. Fixes #1289.
|
2018-03-07 19:42:19 +07:00 |
|
grossmj
|
a3a0657502
|
Do not raise exception if Dynamips or uBridge hypervisor don't return data and are still running. Fixes #1289
|
2018-03-07 19:11:34 +07:00 |
|
Julien Duponchelle
|
e4fdfbd091
|
Code cleanup around ubridge
|
2016-11-17 18:11:56 +01:00 |
|
grossmj
|
1f890b4cad
|
Implements uBridge hypervisor.
|
2015-07-19 22:55:10 -06:00 |
|