grossmj b3dfb87622 Merge branch '2.2' into 3.0 ...

# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.96be36058f5df0ca7e7f.js
#	gns3server/utils/images.py
#	gns3server/version.py
#	requirements.txt
#	tests/compute/docker/test_docker_vm.py
#	tests/controller/test_controller.py

2023-05-22 15:11:17 +08:00

..

api

Fix tests

2023-02-17 21:25:19 +08:00

compute

Merge branch '2.2' into 3.0

2023-05-22 15:11:17 +08:00

controller

Merge branch '2.2' into 3.0

2023-05-22 15:11:17 +08: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

Add back loop

2022-08-27 23:41:52 +02:00

web

Add back loop

2022-08-27 23:41:52 +02: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

Restore missing loop

2022-08-27 23:45:30 +02:00

test_config.py

Add back loop

2022-08-27 23:41:52 +02:00

test_server.py

Rename ssl and auth configuration file settings.

2021-04-12 23:26:42 +09:30

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

Refactor tests

2020-06-16 13:59:03 +09:30