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
..
__init__.py	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
base_gns3_vm.py	ACPI shutdown for GNS3 VM running on Hyper-V. Ref https://github.com/GNS3/gns3-gui/issues/763	2018-08-12 17:11:32 +07:00
gns3_vm_error.py	Manage error when GNS3VM failed to start	2016-09-01 15:36:41 +02:00
hyperv_gns3_vm.py	ACPI shutdown for GNS3 VM running on Hyper-V. Ref https://github.com/GNS3/gns3-gui/issues/763	2018-08-12 17:11:32 +07:00
remote_gns3_vm.py	Do not raise an error if no VM is selected for remote GNS3 VM	2017-01-18 09:49:59 +01:00
virtualbox_gns3_vm.py	Replace vboxnet0 (if it does not exist) by the first available vboxnet interface on Windows. Fixes https://github.com/GNS3/gns3-vm/issues/102	2018-08-26 03:28:38 -07:00
vmware_gns3_vm.py	Fixing race condition when starting the GNS3 VM.	2018-01-10 16:22:55 +07:00