mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-15 10:02:27 +01:00
Conflicts: core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java scripts/vm/hypervisor/xenserver/xenserver56/patch
Conflicts: core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java scripts/vm/hypervisor/xenserver/xenserver56/patch