cloudstack/server/test
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
..
com/cloud Merge branch 'pluggable_vm_snapshot' 2013-10-25 16:47:17 -07:00
org/apache/cloudstack ResourceDetails: 2013-10-24 15:54:49 -07:00
resources Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm" 2013-07-21 22:23:48 -07:00
async-job-component.xml CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
sync-queue-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00