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
..
bindir	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
certs	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
conf	CLOUDSTACK-6204: removing realhostip dependency	2014-03-09 13:46:57 -07:00
conf.dom0	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
css	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
distro	CLOUDSTACK-6220: Take 2, Fix cloudstack init scripts so that they	2014-03-10 16:11:52 -06:00
images	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
js	CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on VMware.	2014-09-15 16:16:45 +05:30
libexec	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
patches/debian	CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval	2014-09-18 12:51:10 +02:00
scripts	CLOUDSTACK-6328: added license header and removed white space	2014-05-27 15:56:47 +05:30
ui	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
vm-script	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
cloudpatch-descriptor.xml	Move the system vm to a separate maven project.	2013-09-20 18:31:02 +08:00
pom.xml	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00
systemvm-descriptor.xml	Remove duplicate scripts and move the remaining items to the systemvm project	2013-10-14 08:02:35 +02:00