Julien Duponchelle f8f6f5dc5d Merge branch 'master' into unstable ...

Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py

2015-04-29 14:25:44 +02:00

..

dynamips

Merge branch 'master' into unstable

2015-04-28 10:46:59 +02:00

iou

Merge branch 'master' into unstable

2015-04-28 10:46:59 +02:00

qemu

Merge branch 'master' into unstable

2015-04-28 10:46:59 +02:00

virtualbox

Do not crash if no console port is available for VBox

2015-04-01 17:59:58 +02:00

vpcs

Final fixes for windows test suite

2015-04-27 23:28:12 +02:00

test_base_vm.py

Support uploading iourc

2015-03-17 16:31:45 +01:00

test_manager.py

Merge branch 'master' into unstable

2015-04-29 14:25:44 +02:00

test_port_manager.py

Drop darwin specific tests

2015-04-15 16:42:26 +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

Fixes tests.

2015-03-14 13:16:27 -06:00