John Bampton
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							28e8e2d009
							
						
					 | 
					
						
						
							
							pre-commit: add hook to trim trailing whitespace (#8205)
						
						
						
						
						
						
					 | 
					
						2024-05-28 09:01:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daan Hoogland
							
						 
					 | 
					
						
						
						
						
							
						
						
							dec9133dcd
							
						
					 | 
					
						
						
							
							CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval
						
						
						
						
						
						
						
						(cherry picked from commit 4d065b9a3a336d59902c266202c1094509c007d2)
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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anthony Xu
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a062e155c
							
						
					 | 
					
						
						
							
							put shell scripts to a seperate directory in XS
						
						
						
						
						
						
						
						use same scripts for both XS and XCP 
						
						
					 | 
					
						2013-12-03 02:05:34 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Nalley
							
						 
					 | 
					
						
						
						
						
							
						
						
							d630fa8697
							
						
					 | 
					
						
						
							
							license header changes for scripts folder from Chip Childers
						
						
						
						
						
						
					 | 
					
						2012-06-23 00:58:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f634c0913
							
						
					 | 
					
						
						
							
							Switch to Apache license
						
						
						
						
						
						
					 | 
					
						2012-04-03 04:50:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							52610ffcb3
							
						
					 | 
					
						
						
							
							add copyright header to shell scripts
						
						
						
						
						
						
					 | 
					
						2012-01-11 18:41:53 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							44678b60bc
							
						
					 | 
					
						
						
							
							add VERSION into to scripts
						
						
						
						
						
						
					 | 
					
						2011-03-23 14:54:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec98a539b4
							
						
					 | 
					
						
						
							
							merge premium xenserver scripts to oss
						
						
						
						
						
						
					 | 
					
						2011-01-28 17:42:27 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							afd8052203
							
						
					 | 
					
						
						
							
							remove unused scripts
						
						
						
						
						
						
					 | 
					
						2010-08-29 18:39:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O)
							
						 
					 | 
					
						
						
						
						
							
						
						
							05c020e1f6
							
						
					 | 
					
						
						
							
							Source code committed
						
						
						
						
						
						
					 | 
					
						2010-08-11 09:13:29 -07:00 | 
					
					
						
						
							
							
							
						
					 |