Edison Su 51a8086cf6 Merge branch 'pluggable_vm_snapshot' ... Conflicts: client/tomcatconf/applicationContext.xml.in engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java engine/storage/integration-test/test/resources/storageContext.xml server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java		2013-10-25 16:47:17 -07:00
..
resources/META-INF/cloudstack	Added StorageStrategyFactory to centralize and deduplicate some logic	2013-10-23 12:40:41 -07:00
src/org/apache/cloudstack/storage/motion	Merge branch 'pluggable_vm_snapshot'	2013-10-25 16:47:17 -07:00
pom.xml	Updating pom.xml version numbers for release 4.3.0-SNAPSHOT	2013-08-01 10:35:00 -04:00