mirror of https://github.com/apache/cloudstack.git
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 |
||
|---|---|---|
| .. | ||
| com/cloud | ||
| org/apache/cloudstack | ||
| resources | ||
| async-job-component.xml | ||
| sync-queue-component.xml | ||