Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							781b7eec3f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6342: UI changes for feature use secondary IP address of NIC in Load balancing.  
						
						 
						
						
						
						
					 
					
						2014-04-04 15:32:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							15c142326f 
							
						 
					 
					
						
						
							
							clean up xenserver resource code  
						
						 
						
						
						
						
					 
					
						2014-04-04 14:14:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							b94a982618 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6327: Updated the removeFromLoadBalancerRule and listLoadBalancerRuleInstances API  
						
						 
						
						... 
						
						
						
						Updated these APIs to use VM primary/secondary details on LB rule.
listLoadBalancerRuleInstances API lists the vm ips which are assigned to lb rule when passed
listlbvmips
removeFromLoadBalancerRule is updated to remove the spcific vm ip entry assinged to LB rule.
Added new param vmidipmap to this API 
						
						
					 
					
						2014-04-04 18:42:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							60c58c5cac 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6339: Getting exception while adding XenServer625 host.  
						
						 
						
						
						
						
					 
					
						2014-04-04 12:30:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							3666df4d34 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6268: Unable to get GPU stats, You tried to call a method that does not exist.  
						
						 
						
						
						
						
					 
					
						2014-04-04 10:21:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							375c799a24 
							
						 
					 
					
						
						
							
							Added missing license header to the unittest  
						
						 
						
						
						
						
					 
					
						2014-04-03 16:02:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							28aa9001c5 
							
						 
					 
					
						
						
							
							Instance wizard UI: Pass data for multi-disk service offerings  
						
						 
						
						
						
						
					 
					
						2014-04-03 14:52:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c6190a1c62 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6335: UI - Acquire IP dialog - show/hide "cross zones" checkbox upon portableipserviceenabled property of the current region instead of Local region.  
						
						 
						
						
						
						
					 
					
						2014-04-03 14:36:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							43ef7ef473 
							
						 
					 
					
						
						
							
							Updating LICENSE AND NOTICE  
						
						 
						
						
						
						
					 
					
						2014-04-03 17:10:01 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e812b7551d 
							
						 
					 
					
						
						
							
							Remove commented-out-code  
						
						 
						
						
						
						
					 
					
						2014-04-03 14:00:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							3a889aa217 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3886: Volume attach/detach implementation for ROOT disk  
						
						 
						
						... 
						
						
						
						Implemented for Xen hypervisor only by now
Unittests are included 
						
						
					 
					
						2014-04-03 11:39:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							af1eba2708 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6286: [Automation] VM deployment is failing in simulator  
						
						 
						
						... 
						
						
						
						Added AggregationContolCommand to simulator 
						
						
					 
					
						2014-04-03 11:45:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							228aa07153 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6286: added FinishAggregationCommand and StartAggregationCommand to simulator"  
						
						 
						
						... 
						
						
						
						This reverts commit 1586f419dc7e22a802c586c535f1c9dbeaee5228. Reverting as the commit that includes the two classes is missing. 
						
						
					 
					
						2014-04-03 10:21:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							a82a1299ec 
							
						 
					 
					
						
						
							
							WIP: Instance wizard UI: Support multi-disk offerings  
						
						 
						
						... 
						
						
						
						Adds front-end support to instance wizard UI for service offerings
supporting multiple disks.
The UI changes will show if a list 'multipleDisks: []' is passed with
the disk offering data options. 
						
						
					 
					
						2014-04-02 16:28:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cd8801f6f7 
							
						 
					 
					
						
						
							
							Do app-level iteration to avoid mysql deadlocks  
						
						 
						
						
						
						
					 
					
						2014-04-02 15:46:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							66486d4322 
							
						 
					 
					
						
						
							
							BUG-ID: CS-19697: Deal with possible DB deadlock issue, return the job into queue for next turn  
						
						 
						
						
						
						
					 
					
						2014-04-02 14:59:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							66bece5906 
							
						 
					 
					
						
						
							
							Don't let VMsync touch the VM if VM has been scheduled for HA but HA is not yet running.  
						
						 
						
						
						
						
					 
					
						2014-04-02 14:58:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e9c81c78b9 
							
						 
					 
					
						
						
							
							Applied Tina's patches for removing the xapi jar  
						
						 
						
						
						
						
					 
					
						2014-04-02 14:00:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							c1c2be4230 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6251: Removed XenServer stub code and used xapi.jar from the central repository instead. Also: fixed typo; ignored file.  
						
						 
						
						
						
						
					 
					
						2014-04-02 09:03:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							9ddfbe1128 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6286: added FinishAggregationCommand and StartAggregationCommand to simulator  
						
						 
						
						
						
						
					 
					
						2014-04-02 20:38:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ashutosh K 
							
						 
					 
					
						
						
						
						
							
						
						
							ca1b911a4f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2266: Adding automation tests for IP reservation feature  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-04-02 10:59:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							6aef044c17 
							
						 
					 
					
						
						
							
							Update Transifex config file (add 4.4 resources config)  
						
						 
						
						
						
						
					 
					
						2014-04-01 19:44:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							883d7f17f7 
							
						 
					 
					
						
						
							
							Value of Global parameter "custom.diskoffering.size.min" is not reflected in UI during new instance creation.  
						
						 
						
						... 
						
						
						
						Added fields to /api and /server classes for CustomDiskOfferingMinSize
to be available in CapabilitiesResponse. Fixed UI code in Instance
Wizard to have this config value as the minimum selectable option when
we are in custom disk size mode. 
						
						
					 
					
						2014-04-01 10:57:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							24820d20d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6288: Changing default ImageFormat to vhdx for hyper-v and allowing registration of vhdx format templates.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Devdeep Singh <devdeep@gmail.com> 
						
						
					 
					
						2014-04-01 14:00:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							06c0486d0b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170 (VMware root-disk support for managed storage)  
						
						 
						
						
						
						
					 
					
						2014-04-01 00:09:53 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							21455222e4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170 (VMware root-disk support for managed storage)  
						
						 
						
						
						
						
					 
					
						2014-03-31 21:20:43 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b2ffd86570 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6309: Fix timeout in KVM when execute VR commands  
						
						 
						
						... 
						
						
						
						Timeout is in seconds rather than milliseconds. 
						
						
					 
					
						2014-03-31 11:30:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1577e75a3d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170 (VMware root-disk support for managed storage)  
						
						 
						
						
						
						
					 
					
						2014-03-31 00:13:30 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							5f800f2d22 
							
						 
					 
					
						
						
							
							Script cleanup  
						
						 
						
						... 
						
						
						
						- new negative tests
- some copy-paste replacement in the code
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-03-30 23:27:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							6617187193 
							
						 
					 
					
						
						
							
							some String instantiations removed  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-03-30 10:31:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							6a9d6f8796 
							
						 
					 
					
						
						
							
							RoleBasedEntityAccessChecker should skip Project resources. IAM does not support Projects yet.  
						
						 
						
						
						
						
					 
					
						2014-03-28 18:56:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							58b2b6b9e1 
							
						 
					 
					
						
						
							
							Add support for XS6.2 Fox hotfix  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:45:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							d4d5cabb50 
							
						 
					 
					
						
						
							
							fix build  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:34:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							25a6234a5b 
							
						 
					 
					
						
						
							
							fix build  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:24:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							578d2f62f1 
							
						 
					 
					
						
						
							
							fix devcloud reboot issue: should not start heartbeat for devcloud  
						
						 
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java 
						
						
					 
					
						2014-03-28 16:24:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7590988dd7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5329: stupid java box/unbox  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/schema/src/com/cloud/vm/VMInstanceVO.java 
						
						
					 
					
						2014-03-28 16:24:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							7b9d0d3fe5 
							
						 
					 
					
						
						
							
							mischanged default user vm template url for xen  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:24:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							504a6cdee2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5432:sync vm and storage commands on mgt server for kvm  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/hypervisor/KVMGuru.java 
						
						
					 
					
						2014-03-28 16:24:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							bd752c2ec0 
							
						 
					 
					
						
						
							
							add md5sum for xen/kvm system vm template  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:23:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							caedc78142 
							
						 
					 
					
						
						
							
							update xen/kvm system vm template download url, and update the os type to 64bit  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:23:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							d1d855fef4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5857: for some reasons, delete secondary pool failed during copy template from secondary storage to primary storage, but the volume is already copied to primary storage, we didn't clean up the volume on primary storage, then all the following copy the same template to primary storage failed, as we are always using the same uuid when creating a new volume, libvirt complaining that the volume already exists.  
						
						 
						
						... 
						
						
						
						Current fix is ignoring "the delete secondary storage error". 
						
						
					 
					
						2014-03-28 16:23:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							d4c7574f12 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5831: Fix NPE, in case the volume isn't attached to any pool  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:23:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7c04aa6115 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5831: return quiescevm field in volumeresponse  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/response/VolumeResponse.java
	server/src/com/cloud/api/query/QueryManagerImpl.java 
						
						
					 
					
						2014-03-28 16:23:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							550834e4b9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5763: if vm is stopped, then don't check hypervisor support live storage migration capabilities.  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:23:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							5bfef62ab0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5607: Don't delete the template if its stored in other zones.  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:22:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							8583b70f2a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed.  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:22:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							f79ba98cce 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5370: delete snapshot on primary storage in case of backup snapshot failed.  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:22:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							6647802d08 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5573: bump gson version to 1.7.2, fix  https://code.google.com/p/google-gson/issues/detail?id=354  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:22:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							a8bfb3dd00 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5737: ignore umount secondary storage failure during backup snapshot  
						
						 
						
						
						
						
					 
					
						2014-03-28 16:22:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							6b7994512d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/storage/StoragePool.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2014-03-28 16:22:16 -07:00