Commit Graph

18 Commits

Author SHA1 Message Date
ca4d09ea40 Merge branch 'master' into 2.0 2016-07-05 15:41:53 +02:00
c0b09ae76a Merge branch '1.5' into 2.0 2016-06-27 14:24:48 +02:00
d79fb231d3 Use uBridge for VirtualBox connections plus some cleaning. Ref #267. 2016-06-24 18:35:39 -06:00
2a1c5cfd9c Merge branch '1.5' into 2.0 2016-06-15 19:14:03 +02:00
52f852bc6d Merge branch '1.5' into 2.0 2016-06-14 09:50:07 +02:00
61ac8763f2 Merge branch '1.5' into 2.0 2016-06-06 14:28:21 +02:00
cb7dbfb256 Merge branch '1.5' into 2.0 2016-06-02 13:47:40 +02:00
00f80f54e8 Merge branch '1.5' into 2.0 2016-05-19 13:32:30 +02:00
d5895c3a47 Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +02:00
f052299eb1 Return status in all cases 2016-05-17 19:51:06 +02:00
cb70cfecd7 Fix docker test 2016-05-16 19:37:47 +02:00
26c7aedba6 Fix docker test about vm suspended 2016-05-16 17:39:32 +02:00
51738e19c3 Some spring cleanup for Docker VM. 2016-05-13 19:28:53 -06:00
5280644327 Return command_line and node_directory via the controller 2016-05-12 10:39:50 +02:00
5a76f81271 Refactoring to use a common node class for all VMs and other (future) objects. 2016-05-11 11:35:36 -06:00
9dca7dfe4a Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
a3b243c501 Merge branch '1.5' into 2.0 2016-05-02 17:08:15 +02:00
58d4a529d4 Rename hypervisor to compute
Fix #487
2016-04-15 17:59:59 +02:00