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
..
common/keys	CLOUDSTACK-6563: Integrating dependencies as part of MSI installer so that those will get installed along with cloud stack installation	2014-05-16 10:50:32 +05:30
installer	Revert "CLOUDSTACK-6834 : 3. Some description changes words like CloudStack etc 4. Change Default installation location if possible include version number 5. Mysql Connector Installer along with other dependecies 6. Add run Service Checkbox 7. Add ReadMe checkbox"	2014-07-04 10:04:04 +05:30
network	CLOUDSTACK-6278	2014-08-05 11:11:02 -07:00
storage	need to check ccp-qemu-img	2014-08-12 15:13:42 -07:00
util	CloudStack CLOUDSTACK-774	2013-02-21 15:46:11 -08:00
vm	CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval	2014-09-18 12:51:10 +02:00
.pydevproject	License header updates for the scripts folder.	2012-08-03 09:38:28 -04:00