grossmj 6ed18c561f Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/qemu/qemu_vm.py # gns3server/config_samples/gns3_server.conf # gns3server/controller/export_project.py # gns3server/controller/project.py # gns3server/controller/snapshot.py # gns3server/handlers/api/controller/project_handler.py # tests/controller/test_export_project.py # tests/controller/test_import_project.py # tests/controller/test_snapshot.py		2024-07-07 19:04:50 +02:00
..
api	Merge branch '2.2' into 3.0	2024-05-16 17:53:39 +07:00
compute	Merge branch '2.2' into 3.0	2024-07-07 19:04:50 +02:00
controller	Merge branch '2.2' into 3.0	2024-07-07 19:04:50 +02:00
resources	Appliance management refactoring:	2021-10-18 18:04:30 +10:30
topologies	Fix tests. Ref #1659	2019-10-08 17:34:16 +08:00
utils	Merge branch '2.2' into 3.0	2024-05-16 17:53:39 +07:00
web	Remove event_loop	2024-05-09 17:53:02 +07:00
__init__.py	Rename vpcs_id to id. Must be an integer in the route definition.	2015-01-18 12:12:11 -07:00
conftest.py	Remove event_loop	2024-05-09 17:53:02 +07:00
test_config.py	Remove event_loop	2024-05-09 17:53:02 +07:00
test_server.py	Pydantic v2 migration	2023-08-04 18:20:06 +10:00
test_topologies.py	Fix topology test	2019-05-26 15:55:29 +07:00
test_utils.py	Refactor tests	2020-06-16 13:59:03 +09:30
utils.py	Fix warnings in tests	2024-05-09 17:11:12 +07:00