mirror of https://github.com/apache/cloudstack.git
Conflicts: core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java scripts/vm/hypervisor/xenserver/vmops |
||
|---|---|---|
| .. | ||
| hyperv/resource | ||
| kvm/resource | ||
| vmware | ||
| xen/resource | ||
| HypervisorCapabilitiesVO.java | ||