Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							684889f0b5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning  
						
						 
						
						
						
						
					 
					
						2014-11-03 10:52:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							e427d0004c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume  
						
						 
						
						
						
						
					 
					
						2014-11-03 17:20:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							99010f463b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7265: For LXC volumes, show unsupported operation error for volume snapshot  
						
						 
						
						
						
						
					 
					
						2014-11-03 17:20:00 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							d6fdb7c6bc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7253: For LXC Vms, show unsupported error for console access  
						
						 
						
						
						
						
					 
					
						2014-11-03 17:19:15 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							1aef5cba66 
							
						 
					 
					
						
						
							
							Fixed Coverity Issues  
						
						 
						
						
						
						
					 
					
						2014-11-03 16:45:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							1c01da3e08 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again. Use row lock to ensure that prev state is either Allocating or Free. This will inturn avoid logging duplicate events  
						
						 
						
						
						
						
					 
					
						2014-11-03 12:40:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							efc9632c1b 
							
						 
					 
					
						
						
							
							CLOUDSTACK:6915 search including removed  
						
						 
						
						
						
						
					 
					
						2014-10-31 15:47:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							138366804d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event.  
						
						 
						
						
						
						
					 
					
						2014-10-31 15:25:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pdion891 
							
						 
					 
					
						
						
						
						
							
						
						
							f28ade56f2 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests"  
						
						 
						
						... 
						
						
						
						This reverts commit 0d1fa9102d7a87863a9f91f88af05e9f38fe6b91. 
						
						
					 
					
						2014-10-31 17:12:54 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pdion891 
							
						 
					 
					
						
						
						
						
							
						
						
							0d1fa9102d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests  
						
						 
						
						
						
						
					 
					
						2014-10-31 16:42:31 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							f543d86eff 
							
						 
					 
					
						
						
							
							saml: Use camelCase api names for SAML login/logout apis  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-10-31 01:24:39 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							62f9bf0fff 
							
						 
					 
					
						
						
							
							PR  #26  CLOUDSTACK-7688, CLOUDSTACK-7747  
						
						 
						
						... 
						
						
						
						Restricted various operations for VM with VM Snapshots #26 
This closes  #26  
						
						
					 
					
						2014-10-30 15:11:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							d8b46b81b9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7767: fixed events are not generated for snapshot creation  
						
						 
						
						
						
						
					 
					
						2014-10-30 13:25:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							a4d8215ebb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots.  
						
						 
						
						... 
						
						
						
						Now they are informed that they cannot perform the operation.
 To perform operation they have to remove VM snapshots of VM. 
						
						
					 
					
						2014-10-30 12:37:50 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							c78f14cbc2 
							
						 
					 
					
						
						
							
							fixed NPE  
						
						 
						
						
						
						
					 
					
						2014-10-29 17:05:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b6d8ceda3d 
							
						 
					 
					
						
						
							
							there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min  
						
						 
						
						
						
						
					 
					
						2014-10-30 02:21:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4ebaf0a583 
							
						 
					 
					
						
						
							
							Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT  
						
						 
						
						
						
						
					 
					
						2014-10-29 14:54:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							307a35a618 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone  
						
						 
						
						... 
						
						
						
						In basic network, the correct network id associate with IP is source network id
rather than network id. 
						
						
					 
					
						2014-10-27 16:46:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							4f43839dae 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to  
						
						 
						
						... 
						
						
						
						complete, slow compared to previous 4.3 release. 
						
						
					 
					
						2014-10-27 16:27:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							4f4595cef8 
							
						 
					 
					
						
						
							
							No need to log discrepancy resource count message for Primary and secondary storage.  
						
						 
						
						
						
						
					 
					
						2014-10-27 15:23:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							9bcf0e1bf6 
							
						 
					 
					
						
						
							
							Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.  
						
						 
						
						... 
						
						
						
						"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU. 
						
						
					 
					
						2014-10-27 13:52:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							32dc09f2c3 
							
						 
					 
					
						
						
							
							even xenserverinvestigator returns true, that means host is up, but XAPI may not work  
						
						 
						
						
						
						
					 
					
						2014-10-23 16:10:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							10cc7f86af 
							
						 
					 
					
						
						
							
							CS-21296: hidden snapshot.backup.rightafter, as it's not needed  
						
						 
						
						
						
						
					 
					
						2014-10-22 15:36:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							4a13f81485 
							
						 
					 
					
						
						
							
							when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA.  
						
						 
						
						
						
						
					 
					
						2014-10-22 15:14:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							ee0f0a1cff 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7771: Throw exception while restoring vm if the template is already deleted. Also fix the usage event being generated from the right template id and fix the log message which sometime showed incorrect template id.  
						
						 
						
						... 
						
						
						
						CLOUDSTACK-4201: listServiceOfferings API needs to be able to take virtualmachineid of SystemVM and return service offerings available for the vm to change service offering 
						
						
					 
					
						2014-10-22 15:03:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							97aa02ceb0 
							
						 
					 
					
						
						
							
							Commits related to taking snapshots that live on primary storage  
						
						 
						
						
						
						
					 
					
						2014-10-22 12:44:33 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							70112bd145 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7761:  
						
						 
						
						... 
						
						
						
						Revert "when system VM ping times out, stop system VM"
This reverts commit ee23be1942001ab732cfb3ad50fa24163cb88a48. 
						
						
					 
					
						2014-10-21 17:19:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							ccf4c66ef1 
							
						 
					 
					
						
						
							
							fix expried certificate in unit test  
						
						 
						
						
						
						
					 
					
						2014-10-21 16:20:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							57dacf99a2 
							
						 
					 
					
						
						
							
							Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"  
						
						 
						
						... 
						
						
						
						Changed "void disconnectVolumeFromHost(VolumeInfo, Host, DataStore)" to "void revokeAccess(DataObject, Host, DataStore)" 
						
						
					 
					
						2014-10-21 16:01:14 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							06f6b00cd1 
							
						 
					 
					
						
						
							
							Snapshot support  
						
						 
						
						
						
						
					 
					
						2014-10-21 16:01:13 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e1a993d37b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed. Also bring the logic of setting source template id to create() method than execute which was wrongly put in.  
						
						 
						
						
						
						
					 
					
						2014-10-21 09:57:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							a72580def0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed.  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 287ff83552081cd91c68af6214016ca4cc4cc040) 
						
						
					 
					
						2014-10-20 16:50:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							622041b513 
							
						 
					 
					
						
						
							
							rats  
						
						 
						
						
						
						
					 
					
						2014-10-17 11:56:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							1de0cb7094 
							
						 
					 
					
						
						
							
							restore barematel work after merge  
						
						 
						
						
						
						
					 
					
						2014-10-17 10:24:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							148efbb73f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/4.5' into merge-master  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py 
						
						
					 
					
						2014-10-16 12:29:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							1f8cf0bee4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.  
						
						 
						
						
						
						
					 
					
						2014-10-16 14:38:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							ec6a666855 
							
						 
					 
					
						
						
							
							Config value having different category in SQL and Config.java.  
						
						 
						
						
						
						
					 
					
						2014-10-16 14:38:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							420d4e0da0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.  
						
						 
						
						
						
						
					 
					
						2014-10-16 14:25:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							5025071954 
							
						 
					 
					
						
						
							
							Config value having different category in SQL and Config.java.  
						
						 
						
						
						
						
					 
					
						2014-10-16 14:01:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							80e0c99189 
							
						 
					 
					
						
						
							
							Removed duplicate code and unused imports which was causing build failure.  
						
						 
						
						
						
						
					 
					
						2014-10-16 13:53:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							efe1e0a544 
							
						 
					 
					
						
						
							
							Fixed coverity and other resource leak issues  
						
						 
						
						... 
						
						
						
						Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com> 
						
						
					 
					
						2014-10-16 12:19:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							53ee4cd794 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7728: Removed duplicate import  
						
						 
						
						
						
						
					 
					
						2014-10-16 10:05:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar 
							
						 
					 
					
						
						
						
						
							
						
						
							7fe3c45142 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7729: listVMSnapshot API not returning parent id in response  
						
						 
						
						
						
						
					 
					
						2014-10-16 09:43:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							e257c13f16 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot  
						
						 
						
						
						
						
					 
					
						2014-10-16 09:38:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							f488a8f72c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes  
						
						 
						
						
						
						
					 
					
						2014-10-16 09:38:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							080bc2e2e9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Jayapal <jayapal@apache.org> 
						
						
					 
					
						2014-10-16 09:38:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							55e11cddca 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot  
						
						 
						
						
						
						
					 
					
						2014-10-16 09:37:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							7cd3438580 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes  
						
						 
						
						
						
						
					 
					
						2014-10-16 09:37:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							6967c6c229 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Jayapal <jayapal@apache.org> 
						
						
					 
					
						2014-10-16 09:37:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							3b442acdd7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 42f628c61c4070f891b16c1a81d2985bcf8b9281) 
						
						
					 
					
						2014-10-15 13:58:22 -07:00