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	Move the generation of the list of ports to the server	2016-09-14 15:21:37 +02:00
atm_port.py	Fix exception with short names for Dynamips interfaces. Fixes #1386.	2018-08-21 19:46:14 +07:00
ethernet_port.py	Fix exception with short names for Dynamips interfaces. Fixes #1386.	2018-08-21 19:46:14 +07:00
fastethernet_port.py	Fix exception with short names for Dynamips interfaces. Fixes #1386.	2018-08-21 19:46:14 +07:00
frame_relay_port.py	Fix exception with short names for Dynamips interfaces. Fixes #1386.	2018-08-21 19:46:14 +07:00
gigabitethernet_port.py	Fix exception with short names for Dynamips interfaces. Fixes #1386.	2018-08-21 19:46:14 +07:00
port_factory.py	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
port.py	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
pos_port.py	Fix exception with short names for Dynamips interfaces. Fixes #1386.	2018-08-21 19:46:14 +07:00
serial_port.py	Fix exception with short names for Dynamips interfaces. Fixes #1386.	2018-08-21 19:46:14 +07:00