sanjeev 
							
						 
					 
					
						
						
						
						
							
						
						
							5bddebb8fc 
							
						 
					 
					
						
						
							
							In case of Hyper-v ssvm/cpvm reboot takes time so made changes to handle this  
						
						 
						
						
						
						
					 
					
						2014-09-22 16:43:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashant Kumar Mishra 
							
						 
					 
					
						
						
						
						
							
						
						
							937aee34ed 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7579 Adding a method to base.py to update storage pool  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-09-22 16:33:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							44e8fc47db 
							
						 
					 
					
						
						
							
							remove trailing spaces  
						
						 
						
						
						
						
					 
					
						2014-09-21 20:16:25 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							4ade1403cf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1973: API DeleteImageStore add secondary storage as decription  
						
						 
						
						
						
						
					 
					
						2014-09-21 19:52:33 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							bca3f1b93f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3822: ListResourceLimits,UpdateResourceCount,UpdateResourceLimit: resourcetype description  
						
						 
						
						
						
						
					 
					
						2014-09-21 19:48:49 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							f7d80d9a6f 
							
						 
					 
					
						
						
							
							generateapi doc version to 4.5.0  
						
						 
						
						
						
						
					 
					
						2014-09-21 16:04:46 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							8ed2d198bd 
							
						 
					 
					
						
						
							
							generateAPI doc: version 4.4.1, year:2014, add back button on main pages  
						
						 
						
						
						
						
					 
					
						2014-09-21 15:58:37 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							29b3df3433 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1632  
						
						 
						
						
						
						
					 
					
						2014-09-21 15:56:47 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							fe2e9a1c5d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-401: add missing file format in docs.js  
						
						 
						
						
						
						
					 
					
						2014-09-21 15:21:17 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							5350e61187 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7494. Migration of a vm fails on Hyper-V. In an earlier commit as part of  
						
						 
						
						... 
						
						
						
						cleaning up vmsync changes, checkvirtualmachine command was updated to return the
power state of the vm. The change was missed for Hyper-V. This caused migration to
fail on cloudstack even though it used to succeed on the hypervisor. Updated the
hyper-v agent code to return the cloudstack equivalent power state for check virtual
machine answer. 
						
						
					 
					
						2014-09-20 19:06:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7cdb67dcf1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after  
						
						 
						
						... 
						
						
						
						management server restarts. 
						
						
					 
					
						2014-09-19 15:12:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								punith-cloudbyte 
							
						 
					 
					
						
						
						
						
							
						
						
							dd4f6bcaf3 
							
						 
					 
					
						
						
							
							IOPS null issue CLOUDSTACK-7570  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com> 
						
						
					 
					
						2014-09-19 16:05:53 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							082aed3d33 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes  get deleted from CS. Fix it by changing the unique name generation to the standard one used by registertemplate. Also cleaned up vmtemplatevo which had too many constructors.  
						
						 
						
						
						
						
					 
					
						2014-09-19 13:40:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sangeetha Hariharan 
							
						 
					 
					
						
						
						
						
							
						
						
							7877f3f960 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7587 - Automation - Add simulator_only attribute to acl related test cases.  
						
						 
						
						
						
						
					 
					
						2014-09-19 16:00:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							dbb70fadc0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7562: Details page for disk offerings only show details for write performance  
						
						 
						
						... 
						
						
						
						-Fixed all related typos
Signed-off-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2014-09-19 09:48:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							30611be15a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7561: UI: After creating a new account, the "Add Account" dialog remains open  
						
						 
						
						... 
						
						
						
						-Removed unused code that was causing javascript exception
Signed-off-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2014-09-19 09:45:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							765d402d69 
							
						 
					 
					
						
						
							
							Merge branch 'bugfix/CID-1114591'  
						
						 
						
						
						
						
					 
					
						2014-09-19 15:16:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							e327716b89 
							
						 
					 
					
						
						
							
							Merge branch 'bugfix/CID-1114601'  
						
						 
						
						
						
						
					 
					
						2014-09-19 15:15:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							2df41e857e 
							
						 
					 
					
						
						
							
							CID-1114592 Replaced duplicate code with a call to super  
						
						 
						
						
						
						
					 
					
						2014-09-19 14:47:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9cfab9b815 
							
						 
					 
					
						
						
							
							CID-1114591 Replace duplicated functionality with a call to super like the other state classes  
						
						 
						
						
						
						
					 
					
						2014-09-19 14:42:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4ad2734576 
							
						 
					 
					
						
						
							
							CID-1114601 to 1114604 Recommended practice is to test the result of  
						
						 
						
						... 
						
						
						
						skip and read for EOF 
						
						
					 
					
						2014-09-19 14:29:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							90df7cf881 
							
						 
					 
					
						
						
							
							CID-1116300 Prevent potential NPE  
						
						 
						
						
						
						
					 
					
						2014-09-19 11:55:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							6f54d48772 
							
						 
					 
					
						
						
							
							CID-1116298 path can be null, make sure that is properly handled  
						
						 
						
						
						
						
					 
					
						2014-09-19 11:54:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							6687727b76 
							
						 
					 
					
						
						
							
							Frank forgot the license header  
						
						 
						
						
						
						
					 
					
						2014-09-19 10:14:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d7f5a2705e 
							
						 
					 
					
						
						
							
							Merge branch 'bugfix/CID-1191682'  
						
						 
						
						
						
						
					 
					
						2014-09-19 08:29:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cf4ff03c90 
							
						 
					 
					
						
						
							
							CID-1191682 Fix missing break statement  
						
						 
						
						
						
						
					 
					
						2014-09-19 08:28:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							18e5aa116e 
							
						 
					 
					
						
						
							
							Fixing an issue around VMware system templates  
						
						 
						
						
						
						
					 
					
						2014-09-18 19:38:59 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sangeetha Hariharan 
							
						 
					 
					
						
						
						
						
							
						
						
							7537c33bcd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7585 -Automation - Fix test_acl_sharednetwork.py and test_acl_sharednetwork_deployVM-impersonation.py to pick 'Shared Network' network offering when creating networks  
						
						 
						
						
						
						
					 
					
						2014-09-18 19:53:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							b11e3bc60a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						 
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-09-18 16:54:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							bc2ec23d09 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						 
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-09-18 16:54:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							8b89494a35 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						 
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-09-18 16:54:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							d315a5e2c9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7522 : Update package.sh to exit rpm with return 1, if there are failure in build  
						
						 
						
						
						
						
					 
					
						2014-09-18 16:01:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							8a13f44b44 
							
						 
					 
					
						
						
							
							Remove duplicate field in constructor  
						
						 
						
						
						
						
					 
					
						2014-09-18 16:02:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d1d8009c68 
							
						 
					 
					
						
						
							
							Fix a stupid bug i introduced  
						
						 
						
						
						
						
					 
					
						2014-09-18 16:02:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							4e07dd1dc4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7581: Empty 'ID' parameters allowed in API calls  
						
						 
						
						... 
						
						
						
						Fix is to fail API calls with empty 'id' parameter value upfront rather than going ahead and failing with NPE later on 
						
						
					 
					
						2014-09-18 17:10:25 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							7f440854f7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7184 retry-wait loop config to deal with network glitches  
						
						 
						
						... 
						
						
						
						(cherry picked from commit a29f954a269c992307f0410df88ca4ac7a0b82a0)
Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java 
						
						
					 
					
						2014-09-18 12:55:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							6e1e56d399 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger  
						
						 
						
						... 
						
						
						
						(cherry picked from commit d04f59a30d130dbb83f162af6e67334fe2c9cef0) 
						
						
					 
					
						2014-09-18 12:51:42 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							2cd99e3e72 
							
						 
					 
					
						
						
							
							CID-1116245: Lock for getting answers from SynchronousListener  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-09-18 11:56:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							3640c61207 
							
						 
					 
					
						
						
							
							CID-1116248: Synchornize method in SynchronousListener  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-09-18 11:54:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							bd1752811c 
							
						 
					 
					
						
						
							
							CID-1116250: Lock on s_appContextDelegates before calling get in ComponentContext  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-09-18 11:52:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							b1d0df16cf 
							
						 
					 
					
						
						
							
							CID-1116258: Guard _storagePools using synchronized in KVMStoragePoolManager  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-09-18 11:48:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							bfa36c0280 
							
						 
					 
					
						
						
							
							CID-1233090, CID-1233089: Synchronize on session object in ApiServer  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-09-18 11:26:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ec134cf010 
							
						 
					 
					
						
						
							
							CID-1116231: Use implicit lock, synchronize _key in Link  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-09-18 11:21:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							032bce5b54 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7565: Fixes to avoiding QEMU issue in attach volume operation by changing test case steps  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-09-18 12:01:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							071004e3e1 
							
						 
					 
					
						
						
							
							removed start/stop VR from queue  
						
						 
						
						
						
						
					 
					
						2014-09-17 19:04:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							674af6e473 
							
						 
					 
					
						
						
							
							added hypervisor capacity for XS 6.5.0  
						
						 
						
						
						
						
					 
					
						2014-09-17 18:15:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							e5a91e40dd 
							
						 
					 
					
						
						
							
							in tagCommand, AsyncJobExecutionContext doesn't need to be created if it doesn't exist  
						
						 
						
						
						
						
					 
					
						2014-09-17 18:15:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chandan Purushothama 
							
						 
					 
					
						
						
						
						
							
						
						
							f1f61e13e5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7573 : Fixed the Guest OS Type used for the ISO  
						
						 
						
						
						
						
					 
					
						2014-09-17 18:21:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							6a11d099cf 
							
						 
					 
					
						
						
							
							Fix Externalization of hard-coded label strings  
						
						 
						
						... 
						
						
						
						-Split 'dictionary.jsp' into two files -> 'dictionary.jsp' and
'dictionary2.jsp' -- this is due to JSP file constraints as the
localization object is getting quite long
-Per change above, 'dictionary' object is now split into an additonal
'dictionary2' object, which is merged with the main dict object on page
load
-All new dictionary mappings should be added to 'dictionary2' now.
Signed-off-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2014-09-17 13:59:13 -07:00