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
..
builtin/nodes	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
docker	Merge branch '2.2' into 3.0	2022-06-21 16:45:25 +02:00
dynamips	Drop Windows support	2022-01-19 22:28:36 +10:30
iou	Finish to clean up local setting usage. Ref #1460	2022-03-31 12:05:47 +08:00
qemu	Remove Qemu binary requirement	2022-04-19 18:21:39 +07:00
virtualbox	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
vmware	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
vpcs	Drop Windows support	2022-01-19 22:28:36 +10:30
__init__.py	Migration to FastAPI	2020-10-02 16:07:50 +09:30
test_base_node.py	Migration to FastAPI	2020-10-02 16:07:50 +09:30
test_manager.py	Finish to clean up local setting usage. Ref #1460	2022-03-31 12:05:47 +08:00
test_notification_manager.py	Migration to FastAPI	2020-10-02 16:07:50 +09:30
test_port_manager.py	Use Pydantic to validate the server config file.	2021-04-12 17:02:23 +09:30
test_project_manager.py	Migration to FastAPI	2020-10-02 16:07:50 +09:30
test_project.py	"Local" command line parameter is only for stopping	2022-03-30 18:38:34 +08:00