Julien Duponchelle d8fb33dba2 Fix merge conflict

2015-06-03 18:58:17 +02:00

..

adapters

Some spring cleaning.

2015-04-08 11:17:34 -06:00

dynamips

Merge branch 'master' into unstable

2015-06-03 18:34:46 +02:00

iou

Do not crash if module ioucon is loaded by tests on Windows

2015-05-26 11:55:30 +02:00

nios

NIO NAT support for QEMU VMs (user mode back-end is used).

2015-05-06 14:59:01 -06:00

qemu

Fix merge conflict

2015-06-03 18:58:17 +02:00

virtualbox

Merge branch 'master' into unstable

2015-06-03 18:34:46 +02:00

vmware

Support for VMware linked clones.

2015-05-30 20:26:38 -06:00

vpcs

Merge branch 'master' into unstable

2015-05-28 12:04:01 +02:00

__init__.py

Basic VMware support (start & stop a VM).

2015-04-30 19:05:37 -06:00

base_manager.py

Upload images API

2015-05-10 21:06:31 +02:00

base_vm.py

A notification stream with process monitoring

2015-05-01 13:20:30 +02:00

port_manager.py

Catch exception in snapshot dialog.

2015-06-01 21:54:08 -06:00

project_manager.py

Alternative local server shutdown (mostly intended for Windows).

2015-03-13 18:57:27 -06:00

project.py

Merge branch 'master' into unstable

2015-05-28 12:04:01 +02:00

vm_error.py

Modules support start iou process (not ioucon and iouyap)

2015-02-12 22:29:32 +01:00