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
..
compute	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
controller	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
handlers	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
resources	Fix an issue when getting size from some SVG file	2017-02-20 17:25:26 +01:00
topologies	Allow to have projects with the same name in different locations.	2018-03-30 23:01:37 +07:00
utils	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
web	The server has now 2 notification streams	2018-08-16 21:31:57 +07:00
__init__.py	Rename vpcs_id to id. Must be an integer in the route definition.	2015-01-18 12:12:11 -07:00
conftest.py	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
test_asyncio.py	All current iou code is async	2015-02-16 17:20:07 +01:00
test_config.py	Fix tests about local compute node	2016-08-23 22:40:26 +02:00
test_run.py	Change default port to 3080	2016-03-25 15:31:17 +01:00
test_topologies.py	Allow to have projects with the same name in different locations.	2018-03-30 23:01:37 +07:00
test_utils.py	Add tests for checking if path are correctly cleaned	2017-04-18 15:50:11 +02:00
utils.py	Fix tests on python 3.4 (#1046)	2017-05-23 12:15:04 +02:00