grossmj 88674455a3 Merge branch '2.1' into 2.2 ... # Conflicts: # gns3server/version.py # tests/compute/docker/test_docker_vm.py		2018-03-14 18:40:37 +07:00
..
builtin/nodes	Fix NAT test.	2017-09-11 15:09:32 +07:00
docker	Merge branch '2.1' into 2.2	2018-03-14 18:40:37 +07:00
dynamips	Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269	2018-01-24 11:11:53 +01:00
iou	Merge 2.1 into 2.2 branch	2018-03-12 13:38:50 +07:00
qemu	Calculate MD5 on thread and before json response, Ref. gui#2239	2018-01-29 14:20:48 +01:00
virtualbox	Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269	2018-01-24 11:11:53 +01:00
vmware	Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269	2018-01-24 11:11:53 +01:00
vpcs	Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269	2018-01-24 11:11:53 +01:00
test_base_node.py	Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269	2018-01-24 11:11:53 +01: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 with ensure_future because of deprecation, Fixes: #1269	2018-01-24 11:11:53 +01:00