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
..
hypervisor	CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval	2014-09-18 12:51:10 +02:00
network	CLOUDSTACK-7428: Allow LXC cluster in SG enabled zones. Use lxc driver in security_group.py script for lxc host	2014-08-27 11:52:59 +05:30
systemvm	CLOUDSTACK-6298:[Windows] if already tmp directory exists inject keys is dailing on widows while starting the management server	2014-04-16 11:07:55 +05:30
pingtest.sh	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00