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
appliances	Sync appliance files.	2022-06-20 20:02:04 +02:00
compute	Merge branch '2.2' into 3.0	2022-06-21 16:45:25 +02:00
configs	New VPCS base config. Fixes #786.	2017-06-28 17:40:54 +08:00
controller	Merge branch '2.2' into 3.0	2022-06-21 16:45:25 +02:00
core	Fix merge error	2022-04-18 17:18:30 +07:00
db	Fix issues when discovering images	2022-06-03 15:35:33 +07:00
schemas	Add controller endpoints to get VirtualBox VMs, VMware VMs and Docker images	2022-06-07 00:38:59 +08:00
services	Add connect endpoint for computes	2021-12-24 13:05:39 +10:30
static	Add missing web-ui file	2022-06-21 10:24:19 +02:00
symbols	Update affinity symbols. Fixes https://github.com/GNS3/gns3-gui/issues/3232	2021-09-20 17:46:19 +09:30
templates	Move to version 3 of the REST API.	2020-11-02 12:05:32 +10:30
utils	Fix issues when discovering images	2022-06-03 15:35:33 +07:00
__init__.py	Use pyupgrade with --py36-plus param.	2021-04-13 18:37:58 +09:30
__main__.py
config.py	Drop Windows support	2022-01-19 22:28:36 +10:30
crash_report.py	Merge branch '2.2' into 3.0	2022-06-21 16:45:25 +02:00
logger.py	Drop Windows support	2022-01-19 22:28:36 +10:30
main.py	Drop Windows support	2022-01-19 22:28:36 +10:30
server.py	Backward compatibility for --log argument	2022-04-27 14:15:29 +07:00
version.py	Back to development on v2.2.34dev2	2022-06-21 11:52:58 +02:00