grossmj d303d13045 Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/base_node.py # gns3server/compute/docker/docker_vm.py # gns3server/compute/iou/iou_vm.py # gns3server/controller/template_manager.py # gns3server/handlers/api/compute/docker_handler.py # gns3server/handlers/api/compute/dynamips_vm_handler.py # gns3server/handlers/api/compute/iou_handler.py # gns3server/handlers/api/compute/qemu_handler.py # gns3server/handlers/api/compute/virtualbox_handler.py # gns3server/handlers/api/compute/vmware_handler.py # gns3server/handlers/api/compute/vpcs_handler.py # gns3server/handlers/api/controller/node_handler.py # gns3server/version.py # requirements.txt # tests/controller/test_controller.py # tests/controller/test_project.py # tests/handlers/api/controller/test_node.py		2022-06-21 16:45:25 +02:00
..
adapters
builtin
docker	Merge branch '2.2' into 3.0	2022-06-21 16:45:25 +02:00
dynamips	Support delete Qemu disk image from API	2022-04-14 17:01:54 +07:00
iou
nios
qemu	Remove Qemu binary requirement	2022-04-19 18:21:39 +07:00
ubridge
virtualbox	Drop Windows support	2022-01-19 22:28:36 +10:30
vmware	Merge branch '2.2' into 3.0	2022-04-27 22:23:05 +07:00
vpcs	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
__init__.py
base_manager.py
base_node.py	Drop Windows support	2022-01-19 22:28:36 +10:30
compute_error.py
error.py
notification_manager.py
port_manager.py	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
project_manager.py
project.py