mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
8caf52c6bc
add xenserver hot fix Conflicts: api/src/com/cloud/vm/VirtualMachineName.java core/src/com/cloud/host/HostInfo.java core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java deps/XenServerJava/src/com/xensource/xenapi/VDI.java engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java server/src/com/cloud/configuration/Config.java