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	The server has now 2 notification streams	2018-08-16 21:31:57 +07:00
appliance_handler.py	Optimize appliance templates update from GitHub repository by only downloading when the repository	2018-08-21 16:26:07 +07:00
compute_handler.py	Allow to resize a Qemu VM disk (extend only).	2018-03-26 18:05:49 +07:00
drawing_handler.py	GNS3-API: implement GET for specific drawing and link	2018-01-05 13:44:46 +01:00
gns3_vm_handler.py
link_handler.py	Offload slow file operations to threads for snapshots and project "save as". Ref #1187 #1307.	2018-04-28 16:01:43 +07:00
node_handler.py	Merge branch '2.1' into 2.2	2018-08-07 21:06:42 +07:00
notification_handler.py	The server has now 2 notification streams	2018-08-16 21:31:57 +07:00
project_handler.py	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
server_handler.py	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
snapshot_handler.py
symbol_handler.py	Handle asyncio timeouts. Ref #1307.	2018-04-28 17:42:02 +07:00