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
embed_shell.py	Fixes running switch console inside PyCharm terminal (Ref. #1172)	2017-08-29 12:28:53 +02:00
input_stream.py	History support for console and telnet application, Fixes: #1083	2017-07-25 16:18:07 +02:00
pool.py
raw_command_server.py	Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566	2018-08-24 18:57:18 +07:00
serial.py	Avoid a crash in some conditions when reading the serial console	2017-02-15 19:31:38 +01:00
telnet_server.py	Add missing coroutine decorator Ref https://github.com/GNS3/gns3-gui/issues/2566	2018-08-25 16:00:40 +07:00