Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96' ...

Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

2013-10-23 12:31:53 -07:00

..

resources/META-INF/cloudstack/api-planner

Spring Modularization

2013-10-02 15:41:04 -07:00

src

Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'

2013-10-23 12:31:53 -07:00

test

sdn hosted vpc gateways (using lswitch)

2013-09-18 16:56:56 +02:00

pom.xml

Compile complete

2013-09-06 15:40:37 -07:00