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
..
builtin/nodes	Fix cloud tests.	2018-06-10 17:56:56 +07:00
docker	Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566.	2018-08-24 18:52:15 +07:00
dynamips	Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566.	2018-08-24 18:52:15 +07:00
iou	Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566.	2018-08-24 18:52:15 +07:00
qemu	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
traceng	Fix test to support Python 3.7 Ref https://github.com/GNS3/gns3-gui/issues/2566	2018-08-25 15:50:08 +07:00
virtualbox	Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566.	2018-08-24 18:52:15 +07:00
vmware	Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566.	2018-08-24 18:52:15 +07:00
vpcs	Fix test to support Python 3.7 Ref https://github.com/GNS3/gns3-gui/issues/2566	2018-08-25 15:50:08 +07:00
test_base_node.py	Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566.	2018-08-24 18:52:15 +07:00
test_manager.py	Fix tests more reliably. Ref #0df997d.	2017-12-18 12:08:14 +01:00
test_notification_manager.py	Rename hypervisor to compute	2016-04-15 17:59:59 +02:00
test_port_manager.py	Improve remote server console host support when binding to 0.0.0.0	2016-10-26 14:43:47 +02:00
test_project_manager.py	Rename hypervisor to compute	2016-04-15 17:59:59 +02:00
test_project.py	Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566.	2018-08-24 18:52:15 +07:00