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
..
arping_gateways.sh.templ	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
backup.sh.templ	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
check_bumpup.sh	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
check_heartbeat.sh.templ	CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval	2014-09-18 12:51:10 +02:00
checkrouter.sh.templ	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
conntrackd.conf.templ	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
disable_pubip.sh	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
enable_pubip.sh.templ	CLOUDSTACK-7028: Fixed adding route for additional public nic on fail over	2014-07-01 15:16:27 +05:30
fault.sh.templ	CLOUDSTACK-2792: Call savepassword.sh inside VR	2013-10-17 20:04:44 -07:00
heartbeat.sh.templ	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
keepalived.conf.templ	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
master.sh.templ	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
primary-backup.sh.templ	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
services.sh	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00