You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

grossmj 8ce0cbf7f7 Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/base_node.py # gns3server/compute/docker/docker_vm.py # gns3server/compute/dynamips/nodes/c1700.py # gns3server/compute/dynamips/nodes/c2600.py # gns3server/compute/dynamips/nodes/c2691.py # gns3server/compute/dynamips/nodes/c3600.py # gns3server/compute/dynamips/nodes/c3725.py # gns3server/compute/dynamips/nodes/c3745.py # gns3server/compute/dynamips/nodes/c7200.py # gns3server/compute/dynamips/nodes/router.py # gns3server/compute/qemu/qemu_vm.py # gns3server/controller/node.py # gns3server/controller/topology.py # gns3server/handlers/api/compute/docker_handler.py # gns3server/handlers/api/compute/dynamips_vm_handler.py # gns3server/handlers/api/compute/qemu_handler.py # gns3server/schemas/docker.py # gns3server/schemas/docker_template.py # gns3server/schemas/dynamips_template.py # gns3server/schemas/dynamips_vm.py # gns3server/schemas/node.py # gns3server/schemas/qemu.py # gns3server/schemas/qemu_template.py		12 hours ago
..
gns3vm	Merge branch '2.2' into 3.0	1 year ago
ports	Remove model validator. Fixes https://github.com/GNS3/gns3-gui/issues/3522	11 months ago
__init__.py	Fix to access resources_path and install_builtin_appliances settings	3 months ago
appliance.py	…
appliance_manager.py	Fix to access resources_path and install_builtin_appliances settings	3 months ago
appliance_to_template.py	…
compute.py	Fix warnings in tests	5 months ago
controller_error.py	…
drawing.py	…
export_project.py	Merge branch '2.2' into 3.0	3 months ago
import_project.py	Merge branch '2.2' into 3.0	3 months ago
link.py	…
node.py	Revert "Backport auxiliary console support for Qemu, Docker and Dynamips nodes"	12 hours ago
notification.py	…
project.py	Convert topologies < 3.0 to have valid node hostnames	2 months ago
snapshot.py	Merge branch '2.2' into 3.0	3 months ago
symbol_themes.py	Merge branch '2.2' into 3.0	5 months ago
symbols.py	Fix tests	10 months ago
topology.py	Merge branch '2.2' into 3.0	12 hours ago
udp_link.py	Merge branch '2.2' into 3.0	4 months ago