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/storage-volume-solidfire	Spring Modularization	2013-10-02 15:41:04 -07:00
src/org/apache/cloudstack/storage/datastore	Squashed & merged commit of the following:	2013-10-23 12:21:43 -07:00
test	New Transaction API	2013-10-16 09:21:00 -07:00
pom.xml	Fixed up the pom.xml to use dependencies specified in cloudstack pom	2013-08-02 13:51:47 -07:00