Julien Duponchelle 1d08d4a5fa Merge branch 'master' into 1.5		2016-04-26 11:49:24 +02:00
..
docker	Test docker resolution	2016-04-07 14:33:04 +02:00
dynamips	Fix Dynamips identifier is already used by another router	2015-10-07 13:50:40 +02:00
iou	Merge branch 'master' into 1.5	2016-03-24 09:17:52 +01:00
qemu	Merge branch 'master' into 1.5	2016-04-26 11:49:24 +02:00
virtualbox	Return vm_directory for VirtualBox and VMware	2015-06-26 17:09:19 +02:00
vmware	Docker capture and refactor common capture code	2016-02-09 16:07:33 +01:00
vpcs	Refactor aux port allocation	2016-02-29 10:44:08 +01:00
test_base_vm.py	Fix tests	2016-03-30 17:41:37 +02:00
test_manager.py	Fix test on Windows	2015-12-14 16:06:51 +01:00
test_port_manager.py	Fix tests	2016-04-11 16:57:59 +02:00
test_project_manager.py	Explicit ID names, remove {uuid} from URLs and add vms in URLs for VMs.	2015-02-04 13:48:29 -07:00
test_project.py	Import / Export with images	2016-04-12 10:11:45 +02:00