mirror of https://github.com/apache/cloudstack.git
Conflicts: client/tomcatconf/applicationContext.xml.in client/tomcatconf/nonossComponentContext.xml.in client/tomcatconf/simulatorComponentContext.xml.in framework/db/src/com/cloud/utils/db/Transaction.java plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java |
||
|---|---|---|
| .. | ||
| resources/META-INF/cloudstack/core | ||
| src/org/apache/cloudstack/storage/cache | ||
| pom.xml | ||