mirror of https://github.com/apache/cloudstack.git
Conflicts: engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java server/src/com/cloud/template/TemplateManagerImpl.java |
||
|---|---|---|
| .. | ||
| api | ||
| components-api | ||
| network | ||
| orchestration | ||
| schema | ||
| service | ||
| storage | ||
| pom.xml | ||