mirror of https://github.com/apache/cloudstack.git
0c1ae20e77
Conflicts: server/src/com/cloud/resource/ResourceManagerImpl.java server/test/com/cloud/resource/MockResourceManagerImpl.java |
||
|---|---|---|
| .. | ||
| com/cloud | ||
| org/apache/cloudstack | ||
| resources | ||
| async-job-component.xml | ||
| sync-queue-component.xml | ||