mirror of https://github.com/apache/cloudstack.git
Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java server/src/com/cloud/template/TemplateManagerImpl.java |
||
|---|---|---|
| .. | ||
| cache | ||
| datamotion | ||
| image | ||
| integration-test | ||
| snapshot | ||
| src/org/apache/cloudstack/storage | ||
| volume | ||
| pom.xml | ||
| storage.ucls | ||