grossmj 9de13c570c Merge branch '2.1' into 2.2 ... # Conflicts: # gns3server/compute/builtin/nodes/cloud.py # gns3server/compute/docker/docker_vm.py # gns3server/compute/dynamips/nodes/ethernet_switch.py # gns3server/compute/iou/iou_vm.py # gns3server/compute/qemu/qemu_vm.py # gns3server/compute/virtualbox/virtualbox_vm.py # gns3server/compute/vmware/vmware_vm.py # gns3server/controller/__init__.py # gns3server/version.py # gns3server/web/web_server.py		2018-10-04 15:44:13 +02:00
..
__init__.py	Base for generic switch nodes. Ref #492.	2016-05-15 11:23:14 -06:00
cloud.py	Merge branch '2.1' into 2.2	2018-10-04 15:44:13 +02:00
ethernet_hub.py	Fix same base MAC for duplicated IOS routers. Fixes #1264.	2018-01-17 14:01:44 +08:00
ethernet_switch.py	Fix same base MAC for duplicated IOS routers. Fixes #1264.	2018-01-17 14:01:44 +08:00
nat.py	Allow to select the default NAT interface in preferences for local server.	2018-03-26 14:23:01 +07:00