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	Implements uBridge hypervisor.	2015-07-19 22:55:10 -06:00
hypervisor.py	Merge branch '2.1' into 2.2	2018-10-04 15:44:13 +02:00
ubridge_error.py	Catch docker namespace error	2016-02-11 15:49:28 +01:00
ubridge_hypervisor.py	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00