grossmj 1ff23348d3 Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/base_node.py # gns3server/compute/docker/__init__.py # gns3server/compute/qemu/qemu_vm.py # gns3server/controller/compute.py # gns3server/controller/gns3vm/virtualbox_gns3_vm.py # gns3server/controller/node.py # gns3server/controller/project.py # gns3server/crash_report.py # gns3server/handlers/api/controller/template_handler.py # gns3server/static/web-ui/index.html # gns3server/static/web-ui/main.8448c96e4facbe79a613.js # gns3server/version.py # tests/compute/iou/test_iou_vm.py # tests/compute/qemu/test_qemu_vm.py # tests/handlers/api/controller/test_template.py		2023-06-20 16:06:53 +09:30
..
builtin/nodes	Add back loop	2022-08-27 23:41:52 +02:00
docker	Merge branch '2.2' into 3.0	2023-06-20 16:06:53 +09:30
dynamips	Add back loop	2022-08-27 23:41:52 +02:00
iou	Merge branch '2.2' into 3.0	2023-06-20 16:06:53 +09:30
qemu	Merge branch '2.2' into 3.0	2023-06-20 16:06:53 +09:30
virtualbox	Add back loop	2022-08-27 23:41:52 +02:00
vmware	Restore missing loop	2022-08-27 23:45:30 +02:00
vpcs	Add back loop	2022-08-27 23:41:52 +02:00
__init__.py	Migration to FastAPI	2020-10-02 16:07:50 +09:30
test_base_node.py	Add back loop	2022-08-27 23:41:52 +02:00
test_manager.py	Add back loop	2022-08-27 23:41:52 +02: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	Add back loop	2022-08-27 23:41:52 +02:00