Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							1a67750cb6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4538: set default value of cpu.overprovisioning.factor and mem.overprovisioning.factor to 1  
						
						 
						
						... 
						
						
						
						On a fresh environment, some values in cloud.configuration table are persisted in com.cloud.server.ConfigurationServerImpl.persistDefaultValues()
A default value need to be set before com.cloud.upgrade.DatabaseUpgradeChecker 
						
						
					 
					
						2013-08-29 12:41:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							53ee2c905b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4538: fix small typo  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 68b668ae8f126e339de971c99e4c29c7f86b3d6e) 
						
						
					 
					
						2013-08-29 11:33:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bharat kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							da6f048dd2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4538 Should update the vmware clusters with the global overporvisioning factors after upgrade to 4.2.  
						
						 
						
						... 
						
						
						
						Signed off by : Nitin Mehta <nitin.mehta@citrix.com> 
						
						
					 
					
						2013-08-29 12:26:54 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b0fc3114f4 
							
						 
					 
					
						
						
							
							Fix build error.  
						
						 
						
						
						
						
					 
					
						2013-08-28 12:18:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6a9caf7487 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4430:[Automation][vmware] Failed to deploy vm, if one host is  
						
						 
						
						... 
						
						
						
						down in a cluster. 
						
						
					 
					
						2013-08-28 11:52:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7e7af7d6f4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4477: in order to select hypervisor host which can access storage pool, need to check storage_pool_host_ref  
						
						 
						
						
						
						
					 
					
						2013-08-28 16:03:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							18b301edb9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4516:[Upgrade][VMWare]  
						
						 
						
						... 
						
						
						
						MySQLIntegrityConstraintViolationException while performing any task
using local storage after upgrade from 3.0.7 to 4.2. 
						
						
					 
					
						2013-08-27 14:13:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							543088a203 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4520: [upgrade][vmware]ExtractVolumeCmd fails with NPE while  
						
						 
						
						... 
						
						
						
						attempting to download a volume. 
						
						
					 
					
						2013-08-27 13:59:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							79c366db2b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1191: Re-enable deployment of SystemVMs on RBD  
						
						 
						
						... 
						
						
						
						This was reverted by 0a5228922b822b57af72249912ed854281e1d85a unintentionnaly
but broke this feature for RBD.
Enable SystemVM deployment on RBD again 
						
						
					 
					
						2013-08-27 17:05:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							358c6e371d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4471. If an instance fails to start then mark the volumes allocated as part of VM creation as removed and set the volume state as destroyed.  
						
						 
						
						
						
						
					 
					
						2013-08-27 17:31:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8113ebb08f 
							
						 
					 
					
						
						
							
							Moved the csvtotags into StringUtils.  It was there to begin with.  No idea who copied it to ConfigurationManager  
						
						 
						
						
						
						
					 
					
						2013-08-26 20:27:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							abbae2aa87 
							
						 
					 
					
						
						
							
							Fixed the problem with offerings and templates.  These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly.  No one fixed since then.  Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items.  
						
						 
						
						
						
						
					 
					
						2013-08-26 17:31:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2d05fe40c0 
							
						 
					 
					
						
						
							
							Removed getPod, getCluster from ConfigurationManager  
						
						 
						
						
						
						
					 
					
						2013-08-26 17:31:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ff6b3fd11a 
							
						 
					 
					
						
						
							
							Removed getzone  
						
						 
						
						
						
						
					 
					
						2013-08-26 17:31:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							49dd7289c0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4468:template created from snapshot is destroyed once we  
						
						 
						
						... 
						
						
						
						restart management server. 
						
						
					 
					
						2013-08-26 11:58:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							b37e6c14c1 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-1365  
						
						 
						
						... 
						
						
						
						UI support for baremetal PXE server
CloudStack CLOUDSTACK-1364
UI support for baremetal DHCP server
Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java 
						
						
					 
					
						2013-08-22 16:35:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							0fdaef8e3d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4455:object_store - Template sync results in private  
						
						 
						
						... 
						
						
						
						templates being synced to all the secondary stores. 
						
						
					 
					
						2013-08-22 16:02:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2611ac75c1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4454:object_store - Not able to delete secondary storage when  
						
						 
						
						... 
						
						
						
						existing snapshots are deleted. 
						
						
					 
					
						2013-08-22 16:02:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							ad0fba31a3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4115 : Encrypt password in cluster_details table. This fix is to handle upgrades from versions earlier than 3.0.5 and 4.0. Upgrade was not handled when the cluster_details password encryption was introduced.  
						
						 
						
						
						
						
					 
					
						2013-08-22 18:53:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e65a302f15 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3950: add "regionsecondaryenabled" in listCapabilitiesCmd  
						
						 
						
						... 
						
						
						
						response. 
						
						
					 
					
						2013-08-20 15:59:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3bd2bbf59d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3950:Set cross-zone flag in registerTemplate/registerIso in  
						
						 
						
						... 
						
						
						
						case of region-wide secondary is enabled. 
						
						
					 
					
						2013-08-20 14:13:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c4f41f4a53 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4395:[Object_store_refactor] Default template is not  
						
						 
						
						... 
						
						
						
						available for use to deploy vm in case of multi zone environment. 
						
						
					 
					
						2013-08-19 17:37:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4fd09cb344 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4324: delete snapshot_store_ref, if create snapshot failed on primary storage  
						
						 
						
						
						
						
					 
					
						2013-08-19 15:26:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0040c4adef 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4363: fix possible NPE, if copy volume failed.  
						
						 
						
						
						
						
					 
					
						2013-08-19 15:25:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							77e7ccbbe1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4325: add more test cases for zone wide storage pool allocator  
						
						 
						
						
						
						
					 
					
						2013-08-19 15:25:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3937a7b5a5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4400:[object_store_refactor] Three entries for one template  
						
						 
						
						... 
						
						
						
						in template_store_ref when MS was restarting during template download. 
						
						
					 
					
						2013-08-19 15:01:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f23f1530e7 
							
						 
					 
					
						
						
							
							Removed missing class from application context  
						
						 
						
						
						
						
					 
					
						2013-08-19 14:13:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							092e20204a 
							
						 
					 
					
						
						
							
							Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl  
						
						 
						
						
						
						
					 
					
						2013-08-19 14:13:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							564502abd7 
							
						 
					 
					
						
						
							
							Moved the virtualmachine implementation into engine/orchestration  
						
						 
						
						
						
						
					 
					
						2013-08-19 14:13:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba359c3fe 
							
						 
					 
					
						
						
							
							Moved VirtualMachineManager into engine  
						
						 
						
						
						
						
					 
					
						2013-08-19 14:13:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5d3bc5339e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4399:[Templates] template entries are deleted from  
						
						 
						
						... 
						
						
						
						template_store_ref when downloadTemplate times out. 
						
						
					 
					
						2013-08-19 11:27:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f1c63df665 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4403: vmInstanceDao - initialize the SearchBuilder in init() method instead of the search dao method which wasn't thread safe, and could cause NPEs during search builder initializing.  
						
						 
						
						
						
						
					 
					
						2013-08-19 10:28:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							17b6f1c570 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4294 After upgrade of CloudStack to 4.2, support old vswitch type in existing clusters if user changes the vswitch backend to another type of vSwitch  
						
						 
						
						... 
						
						
						
						While upgrading to 4.2, the type of vswitch being used by each cluster is persisted to cluster_details table. This helps if user want to change the type of vswitch used in a zone or entire cloud later on but leave existing cluster continue to use old vswitches. Hence even after modifying the type of vswitch at cloud level (by modifying global configuration parameters) or modifying the type vswitch at zone level (by modifying the traffic label) would not disturb operation of existing clusters.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-19 16:32:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ba4a05eed1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4287: Template sync should remove template_store_ref entry  
						
						 
						
						... 
						
						
						
						for corrupted template. 
						
						
					 
					
						2013-08-15 14:56:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							81fedcfa3e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4338: catch up exception in case of deleting volume in parallel: it's possible that two threads can delete one volume at the same time, if the volume state is in Expunging  
						
						 
						
						
						
						
					 
					
						2013-08-14 18:16:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c675f826e5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied  
						
						 
						
						... 
						
						
						
						to Staging storage during snapshot creation. 
						
						
					 
					
						2013-08-14 18:12:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							37d58313c9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4325: if userdispersing algorithm is used, then zone wide storages never been picked up  
						
						 
						
						
						
						
					 
					
						2013-08-14 15:52:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							374de76dae 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4324: need to clean up snapshot_store_ref, if creating snapshot failed.  
						
						 
						
						
						
						
					 
					
						2013-08-14 14:59:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							0f60b5d41c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack  
						
						 
						
						
						
						
					 
					
						2013-08-14 15:02:57 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							67beef15c9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3706:[Object_Store_Refactor] Failed to create template from  
						
						 
						
						... 
						
						
						
						stopped guest vm's root disk. 
						
						
					 
					
						2013-08-14 13:11:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							efa861cd5c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4287  
						
						 
						
						... 
						
						
						
						Builtin template Ready Status is No even after the Status is downlaod complete. The reason was that template sync updates only the template download state but not the state. Fixing that. Ideally we should change the state through state machine only.
Signed off by : nitin mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2013-08-14 18:43:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							21831211f6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4295 : TemplateTO should contain physical size along with virtual size. Usage ignores templates with size 0  
						
						 
						
						
						
						
					 
					
						2013-08-14 17:34:05 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							02d1757724 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4316: updateSystemVms is not need in Upgrade304to305 as new templates are used in upgrade from 4.1 to 4.2  
						
						 
						
						
						
						
					 
					
						2013-08-14 11:03:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b2d2f2c050 
							
						 
					 
					
						
						
							
							Fixed deployDb - in setRAWformatForRBDVolumes use executeUpdate instead of executeQuery when perform an update with the prepared statement  
						
						 
						
						
						
						
					 
					
						2013-08-13 17:14:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c58f15d867 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4222: use new volume object in case of migrate volume  
						
						 
						
						
						
						
					 
					
						2013-08-13 15:16:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5c35bd1b3e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3860: S3 and Swift-backed Secondary Storage Migration  
						
						 
						
						
						
						
					 
					
						2013-08-13 11:55:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							04f378bcff 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4114: Use RAW disk images for RBD instead of QCOW2  
						
						 
						
						
						
						
					 
					
						2013-08-13 16:14:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							b172eb21c4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4279. Usage manager - Parameter index out of range error  
						
						 
						
						
						
						
					 
					
						2013-08-13 15:58:17 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d57796b94f 
							
						 
					 
					
						
						
							
							Fix XML validation errors  
						
						 
						
						
						
						
					 
					
						2013-08-13 08:25:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							3df5571d2e 
							
						 
					 
					
						
						
							
							Resolved merge conflicts  
						
						 
						
						
						
						
					 
					
						2013-08-12 20:15:24 -07:00