Gaurrav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							9e19a9afdb 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-7408: Fixed - Private key of the ssh keypair was getting corrupted"  
						
						... 
						
						
						
						This reverts commit e921ec6ec79c50096d58264d60c15091969ff888.
CLOUDSTACK-7408: sshClient.py - removing function load_host_keys(). This function is used to load host keys from local host keys file and to save back the host key. It is not needed while running test cases because we are connecting to unknown host anyway and don't want to use any local host key file. We have the AutoAddPolicy for missing host key file, hence whenever ssh connects to a new host, it will save the host key in memory temporarily.
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:59:04 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							0d6e3e48ba 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7805: test_vpc_vms_deployment.py - Removing invalid steps from test case  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:58:23 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							d5316d0572 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7685: Fixed copy template method call in test_escalations_template.py. Removed unbound method of the same name as bound method from base library and changed method call accordingly  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:55:52 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							6d7666b135 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7801: test_volumes.py - Fixed import and pep8 issues  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:54:40 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							7b48b69763 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7802: test_vpc_network.py - Increasing polling period for network state check  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:53:59 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							883123630c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7682: Fixed usage event issue. Used api client of account for which we are checking the usage  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:53:27 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							1f7ffb2618 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7684: Fixed Exception not raised issue in secondary storage limits test suite test_ss_max_limits.py  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:52:41 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							bf7ce74c93 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7691: Fixed 'Exception not raised' issue in test_project_limits.py  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:52:03 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							5d37f37436 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7692: Fixed template register issue in test_project_usage.py  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:23:01 +05:30 
						 
				 
			
				
					
						
							
							
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							b277b1abd8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7728: Test script to identify product issue  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:22:07 +05:30 
						 
				 
			
				
					
						
							
							
								Prashant Kumar Mishra 
							
						 
					 
					
						
						
						
						
							
						
						
							9e37a51bde 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7632:Automation for volume life cycle testPath  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-04 11:12:16 +05:30 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							28d5b9827a 
							
						 
					 
					
						
						
							
							remove duplicate import  
						
						
						
						
					 
					
						2014-11-03 17:04:30 -08:00 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							c8f72780ea 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7834  
						
						... 
						
						
						
						Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A zone
Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
						
						
					 
					
						2014-11-03 16:44:53 -08:00 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							62c5cefb82 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7834  
						
						... 
						
						
						
						Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A zone 
						
						
					 
					
						2014-11-03 16:43:09 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6a28035e73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3212: ui > infrastructure > zones > zone > physical network > guest > network > guest ip range - listview: add gateway, netmask field.  
						
						
						
						
					 
					
						2014-11-03 15:56:46 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							207ec2574c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3212: ui > infrastructure > zones > zone > physical network > guest > network > guest ip range - listview: add gateway, netmask field.  
						
						
						
						
					 
					
						2014-11-03 15:55:06 -08:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							37cb63f6b7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3608 remove duplicate entries  
						
						
						
						
					 
					
						2014-11-03 15:32:09 -08:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							ddfd74dba1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3608 removing duplicate entries, IDs not saved anywhere else hence safe to remove  
						
						
						
						
					 
					
						2014-11-03 15:28:11 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							84e44a4dba 
							
						 
					 
					
						
						
							
							systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE20143566)  
						
						... 
						
						
						
						Just prefer TLS over SSL in apache configuration in systemvm
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 88acc9bd53cbf6f8896d32576f916c20704a3403)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-11-04 01:50:06 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							88acc9bd53 
							
						 
					 
					
						
						
							
							systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE20143566)  
						
						... 
						
						
						
						Just prefer TLS over SSL in apache configuration in systemvm
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-11-04 01:43:55 +05:30 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							aa84770347 
							
						 
					 
					
						
						
							
							if attach volume fails, destroy the VBD device  
						
						
						
						
					 
					
						2014-11-03 11:20:37 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							07ba078ee6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning  
						
						
						
						
					 
					
						2014-11-03 11:19:06 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6830cbc15a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7832: Move some job db update and item purge to  
						
						... 
						
						
						
						completeAsyncJob transaction to avoid MySQL deadlock. 
						
						
					 
					
						2014-11-03 11:18:52 -08:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ffaabdc13f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7832: Move some job db update and item purge to  
						
						... 
						
						
						
						completeAsyncJob transaction to avoid MySQL deadlock. 
						
						
					 
					
						2014-11-03 10:41:36 -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 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							80846ba98a 
							
						 
					 
					
						
						
							
							Bump debian package version to 4.6.0-SNAPSHOT as well  
						
						
						
						
					 
					
						2014-11-03 10:36:13 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							34b7288ca4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7748: Cloudstack version number is missing in system vm template. /etc/cloudstack-release in system vm does not have version number which leads in vm deployment failure while checking router version.  
						
						
						
						
					 
					
						2014-11-03 12:13:04 +05:30 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							efc9632c1b 
							
						 
					 
					
						
						
							
							CLOUDSTACK:6915 search including removed  
						
						
						
						
					 
					
						2014-10-31 15:47:18 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							21f39577e4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7826: UI - dialog widget - dependent dropdown field (dependsOn property specified) - fix a bug that default opton in dependent dropdown field didn't trigger change event handler until another option in dependent dropdown field was selected.  
						
						
						
						
					 
					
						2014-10-31 15:33:07 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3760fdeeb4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7826: UI - dialog widget - dependent dropdown field (dependsOn property specified) - fix a bug that default opton in dependent dropdown field didn't trigger change event handler until another option in dependent dropdown field was selected.  
						
						
						
						
					 
					
						2014-10-31 15:31:24 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							6df396c9c0 
							
						 
					 
					
						
						
							
							Merge branch '4.5' of  https://git-wip-us.apache.org/repos/asf/cloudstack  into 4.5  
						
						
						
						
					 
					
						2014-10-31 15:29:40 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							0c153966e6 
							
						 
					 
					
						
						
							
							CLOUDSTACK:6915 search including removed  
						
						
						
						
					 
					
						2014-10-31 15:29:07 -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 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							2652195010 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event.  
						
						
						
						
					 
					
						2014-10-31 15:24:32 -07:00 
						 
				 
			
				
					
						
							
							
								Logan Barfield 
							
						 
					 
					
						
						
						
						
							
						
						
							3a52a83fae 
							
						 
					 
					
						
						
							
							Fixed root disk resize on deploy for RBD.  
						
						... 
						
						
						
						Signed-off-by: Wido den Hollander <wido@widodh.nl> 
						
						
					 
					
						2014-10-31 22:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								pdion891 
							
						 
					 
					
						
						
						
						
							
						
						
							aaa561a283 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests"  
						
						... 
						
						
						
						This reverts commit 0d1fa9102d7a87863a9f91f88af05e9f38fe6b91. 
						
						
					 
					
						2014-10-31 17:14:59 -04: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 
							
						 
					 
					
						
						
						
						
							
						
						
							5b1cbc442a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests  
						
						
						
						
					 
					
						2014-10-31 16:43:57 -04:00 
						 
				 
			
				
					
						
							
							
								pdion891 
							
						 
					 
					
						
						
						
						
							
						
						
							0d1fa9102d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests  
						
						
						
						
					 
					
						2014-10-31 16:42:31 -04:00 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							6c04d867b0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7660: Enhance system vm template to support baremetal  
						
						... 
						
						
						
						Installed flask package and removed the disk expert recipe in
system vm template to keep only one partition
Signed-off-by:  Frank Zhang <frank.zhang@citrix.com> 
						
						
					 
					
						2014-10-31 19:35:09 +05:30 
						 
				 
			
				
					
						
							
							
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							e463d6d21c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7824: using debian 7.7.0 for systemvm template  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-10-31 19:06:07 +05:30 
						 
				 
			
				
					
						
							
							
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							93529e47fd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7824: using debian 7.7.0 and  
						
						... 
						
						
						
						added 'sharutils' package installation in system template
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-10-31 18:52:17 +05:30 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e1c788ca3c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC  
						
						... 
						
						
						
						OSX always declaims it's behind NAT no matter it's true or not, thus result in
confusion of openswan.
Add parameter "forceencaps=yes" to openswan to make sure non NAT VPN connection
from OSX can pass through. 
						
						
					 
					
						2014-10-30 17:24:57 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							03a43159d8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC  
						
						... 
						
						
						
						OSX always declaims it's behind NAT no matter it's true or not, thus result in
confusion of openswan.
Add parameter "forceencaps=yes" to openswan to make sure non NAT VPN connection
from OSX can pass through. 
						
						
					 
					
						2014-10-30 17:23:34 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							723aedf9b1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7820: Don't consider disabled hosts for calculating disable threshold.  
						
						
						
						
					 
					
						2014-10-30 17:05:11 -07:00