Daan Hoogland dec9133dcd CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval ... (cherry picked from commit 4d065b9a3a) Conflicts: plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java server/src/com/cloud/configuration/Config.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/resource/DiscovererBase.java		2014-09-18 12:51:10 +02:00
..
kvm	Add script to ensure cgroups are not co-mounted in rhel7/lxc. If required, script will unmount co-mounted cgroups and remount them seperately	2014-09-11 14:34:40 +05:30
xenserver	CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval	2014-09-18 12:51:10 +02:00
versions.sh	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00