mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +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