cloudstack/engine/storage/integration-test/test/resources
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
..
StorageAllocatorTestContext.xml Added the missing directories 2013-07-26 16:34:09 -07:00
component.xml Added the missing directories 2013-07-26 16:34:09 -07:00
s3_testng.xml Added the missing directories 2013-07-26 16:34:09 -07:00
storageContext.xml Merge branch 'pluggable_vm_snapshot' 2013-10-25 16:47:17 -07:00
testng.xml Added the missing directories 2013-07-26 16:34:09 -07:00