amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							960b7bbf74 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7977  
						
						 
						
						... 
						
						
						
						Fix password generator, add guards for minimum length 
						
						
					 
					
						2014-11-26 15:08:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							95ea203907 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7976 : Param validation for global params involving domain name  
						
						 
						
						
						
						
					 
					
						2014-11-26 14:54:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							86895ec13c 
							
						 
					 
					
						
						
							
							Add validation for domain names passed via global pamaremets  
						
						 
						
						
						
						
					 
					
						2014-11-26 14:45:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							9585aa0b51 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit eae733817b3670b0151410c027325f78013392ad) 
						
						
					 
					
						2014-11-25 15:55:54 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Vega 
							
						 
					 
					
						
						
						
						
							
						
						
							02ca6f2e5b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c919ff83d81528b89017b5f5731b2e46350e3dfa) 
						
						
					 
					
						2014-11-25 15:55:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							7ff31f1b22 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/inetaddress'  
						
						 
						
						... 
						
						
						
						- Tested locally against unit tests
- TravisCI build passed: https://travis-ci.org/apache/cloudstack/builds/41990351 
- Manual QA passed for basic auth and saml auth using default IDP settings
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
	server/src/com/cloud/api/ApiServlet.java 
						
						
					 
					
						2014-11-25 14:32:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							eae733817b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com> 
						
						
					 
					
						2014-11-25 12:22:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Vega 
							
						 
					 
					
						
						
						
						
							
						
						
							c919ff83d8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com> 
						
						
					 
					
						2014-11-25 11:55:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7175247c5e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7966:  
						
						 
						
						... 
						
						
						
						remove snapshot_store_ref entry, in which role is Primary, during
storage GC 
						
						
					 
					
						2014-11-24 14:30:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4e5b3d028d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7966:  
						
						 
						
						... 
						
						
						
						remove snapshot_store_ref entry, in which role is Primary, during
storage GC 
						
						
					 
					
						2014-11-24 14:27:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							72ba98b1b8 
							
						 
					 
					
						
						
							
							Validate IPv4 address using Apache Commons Validator  
						
						 
						
						
						
						
					 
					
						2014-11-24 14:43:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							87a7810ade 
							
						 
					 
					
						
						
							
							Fix UnitTest ApiServlet  
						
						 
						
						
						
						
					 
					
						2014-11-24 11:48:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d475b62838 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits.  
						
						 
						
						
						
						
					 
					
						2014-11-24 13:44:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							c615aafd77 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7962: Change state to Volume State  
						
						 
						
						
						
						
					 
					
						2014-11-24 12:08:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							690a5ded35 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7962: VM Snaptshot should add check for root volume status also  
						
						 
						
						
						
						
					 
					
						2014-11-24 11:20:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							31db58f720 
							
						 
					 
					
						
						
							
							some unused fields deleted  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-11-23 19:49:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							712a729bd7 
							
						 
					 
					
						
						
							
							unused logger removed  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-11-23 19:49:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							3577423da9 
							
						 
					 
					
						
						
							
							removed executable flags from java classes  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-11-23 19:49:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							2a6d6891eb 
							
						 
					 
					
						
						
							
							Some simplification on getClientAddress in ApiServlet  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-11-23 19:48:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							fa52ffad65 
							
						 
					 
					
						
						
							
							unit test for getClientAddress  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-11-23 19:48:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b85183ede7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong  
						
						 
						
						... 
						
						
						
						url. 
						
						
					 
					
						2014-11-21 15:18:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9ac93d3e43 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong url.  
						
						 
						
						
						
						
					 
					
						2014-11-21 14:36:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							4bd49df3f5 
							
						 
					 
					
						
						
							
							Use InetAddress for passing Remote Address instead of String  
						
						 
						
						
						
						
					 
					
						2014-11-21 12:10:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Syed 
							
						 
					 
					
						
						
						
						
							
						
						
							9f8d0051ed 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)  
						
						 
						
						... 
						
						
						
						Signed-off-by: Will Stevens <wstevens@cloudops.com> 
						
						
					 
					
						2014-11-21 03:39:57 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							1be6fb143e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation  
						
						 
						
						... 
						
						
						
						Signed-off-by: Will Stevens <wstevens@cloudops.com> 
						
						
					 
					
						2014-11-21 03:38:52 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							66e0f049db 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying  
						
						 
						
						... 
						
						
						
						all the tags of all resources. 
						
						
					 
					
						2014-11-20 09:48:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5fa7801b20 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying  
						
						 
						
						... 
						
						
						
						all the tags of all resources. 
						
						
					 
					
						2014-11-20 09:46:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7de9d2f002 
							
						 
					 
					
						
						
							
							Revert "BUG-ID: CS-27662: ListTags API is ignoring the resourceID and displaying"  
						
						 
						
						... 
						
						
						
						This reverts commit 3014fd00895a8467e627b09845fb5de4fdc373b5. 
						
						
					 
					
						2014-11-20 09:44:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3014fd0089 
							
						 
					 
					
						
						
							
							BUG-ID: CS-27662: ListTags API is ignoring the resourceID and displaying  
						
						 
						
						... 
						
						
						
						all the tags of all resources.
Reviewed-by: Frank 
						
						
					 
					
						2014-11-20 09:31:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Syed 
							
						 
					 
					
						
						
						
						
							
						
						
							8ea7902075 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)  
						
						 
						
						... 
						
						
						
						Signed-off-by: Will Stevens <wstevens@cloudops.com> 
						
						
					 
					
						2014-11-20 03:46:03 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4140811549 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7947:  
						
						 
						
						... 
						
						
						
						double check if parent snapshot is removed or not, when creating new
snapshot
Reviewed-by: Min 
						
						
					 
					
						2014-11-19 16:13:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							bd79965329 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7947:  
						
						 
						
						... 
						
						
						
						double check if parent snapshot is removed or not, when creating new
snapshot
Reviewed-by: Min 
						
						
					 
					
						2014-11-19 16:12:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2ccecce515 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7946:  
						
						 
						
						... 
						
						
						
						fix compile 
						
						
					 
					
						2014-11-19 16:09:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							15c0efb774 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7946:  
						
						 
						
						... 
						
						
						
						fix compile 
						
						
					 
					
						2014-11-19 16:08:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							d856a2acad 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7946:  
						
						 
						
						... 
						
						
						
						remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min 
						
						
					 
					
						2014-11-19 16:08:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							67113ff0b2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7946:  
						
						 
						
						... 
						
						
						
						remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min 
						
						
					 
					
						2014-11-19 16:06:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							f0a4a639de 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7941: CloudStack should log IP address of actual client even if a ReverseProxy is there  
						
						 
						
						
						
						
					 
					
						2014-11-19 16:07:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							4e896938ee 
							
						 
					 
					
						
						
							
							BUG-ID: CLOUDSTACK-5324 when router requires upgrade throw ResourceUnavailableException with scope VirtualRouter. API willl return generic Network Unavailable error.  
						
						 
						
						... 
						
						
						
						Reviewed-By: Damoder 
						
						
					 
					
						2014-11-19 09:46:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							968ca060ee 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and data disk storage tag  
						
						 
						
						... 
						
						
						
						Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426  
						
						
					 
					
						2014-11-18 14:07:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							7f54894045 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7559 After migrating root volume to other cluster wide storage, start VM is not running the VM with root disk from new storage.  
						
						 
						
						... 
						
						
						
						Changes:
- During VM start, do not use the last host Id, if the host's cluster does not match the cluster provided in the deployment plan. 
						
						
					 
					
						2014-11-18 14:07:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							48553d7434 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7559 After migrating root volume to other cluster wide storage, start VM is not running the VM with root disk from new storage.  
						
						 
						
						... 
						
						
						
						Changes:
- During VM start, do not use the last host Id, if the host's cluster does not match the cluster provided in the deployment plan. 
						
						
					 
					
						2014-11-18 09:47:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							f2ccee7a03 
							
						 
					 
					
						
						
							
							name convention adherence  
						
						 
						
						
						
						
					 
					
						2014-11-18 16:52:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							302d5195d4 
							
						 
					 
					
						
						
							
							Merge branch 'bugfix/CID-1254835'  
						
						 
						
						
						
						
					 
					
						2014-11-18 14:31:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d4a329c4 
							
						 
					 
					
						
						
							
							Package name should reflect the location on the filesystem or viseversa  
						
						 
						
						
						
						
					 
					
						2014-11-18 14:12:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							9c328cb9dd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7929: While creating network offering if one specifies negative value for network rate then we will convert that value to 0 i.e. unlimited  
						
						 
						
						... 
						
						
						
						This closes  #40  
						
						
					 
					
						2014-11-18 14:25:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							8307dd9105 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7930, CLOUDSTACK-7931: Do not allow to set invalid values for global settings which are of type integer and float  
						
						 
						
						... 
						
						
						
						This closes  #41  
						
						
					 
					
						2014-11-18 14:25:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							4721e66d0e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7541: Added restriction to not allow custom disk offering with disksize UI doesn't allow but with API we were able to create custom disk offering with disk size which was causing this issue  
						
						 
						
						... 
						
						
						
						This closes  #28  
						
						
					 
					
						2014-11-18 14:24:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							44d12330b9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7758: Fixed although api calls are failing, event tab shows them as successful  
						
						 
						
						... 
						
						
						
						This closes  #29  
						
						
					 
					
						2014-11-18 14:24:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							ae199b6ce7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop.  
						
						 
						
						... 
						
						
						
						If we create VM with shared service offering and attach disk with local disk offering,
and one of storage pool is full(cannot be allocated) and other is not full then
we are not putting the cluster in avoid list which is causing this infinite loop.
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated) 
						
						
					 
					
						2014-11-18 14:12:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							c04cdae60b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7767: fixed events are not generated for snapshot creation  
						
						 
						
						
						
						
					 
					
						2014-11-18 14:12:33 +05:30