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
..
test	Merge branch 'pluggable_vm_snapshot'	2013-10-25 16:47:17 -07:00
pom.xml	Cleanup pom.xml in various projects to properly use managed versions and other defaults	2013-09-21 17:21:06 +08:00