grossmj 09ac7fd7fb Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/base_manager.py # gns3server/handlers/api/compute/dynamips_vm_handler.py # gns3server/handlers/api/compute/iou_handler.py # gns3server/handlers/api/compute/project_handler.py # gns3server/handlers/api/compute/qemu_handler.py # gns3server/handlers/api/controller/node_handler.py # gns3server/handlers/api/controller/project_handler.py # gns3server/handlers/index_handler.py # tests/handlers/api/compute/test_project.py # tests/handlers/api/compute/test_qemu.py # tests/handlers/api/controller/test_node.py # tests/handlers/api/controller/test_project.py		2021-05-15 20:46:34 +09:30
..
api	Add user groups support.	2021-05-15 15:10:02 +09:30
compute	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
controller	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
handlers/api	Merge branch '2.2' into 3.0	2021-05-15 20:46:34 +09:30
resources	Fix an issue when getting size from some SVG file	2017-02-20 17:25:26 +01:00
topologies	Fix tests. Ref #1659	2019-10-08 17:34:16 +08:00
utils	Generate new config for each test. Fixes tests.	2021-04-12 19:37:59 +09:30
web	Merge branch 'master' into 3.0	2021-04-10 12:46:40 +09:30
__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	Fix issues with latest version of sqlalchemy	2021-05-08 15:37:51 +09:30
test_config.py	Rename ssl and auth configuration file settings.	2021-04-12 23:26:42 +09:30
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