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
..
api	Add controller endpoints to get VirtualBox VMs, VMware VMs and Docker images	2022-06-07 00:38:59 +08:00
compute	Merge branch '2.2' into 3.0	2022-06-21 16:45:25 +02:00
controller	Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619	2022-06-15 15:30:44 +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	Do not cache to md5sum file in some situations	2022-04-18 17:13:52 +07:00
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	Finish to clean up local setting usage. Ref #1460	2022-03-31 12:05:47 +08:00
test_config.py	Secure controller to compute communication using HTTP basic authentication	2021-11-18 18:37:10 +10: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