Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							af14699c4c 
							
						 
					 
					
						
						
							
							fixing the build _ AffinityGroup command changes  
						
						 
						
						
						
						
					 
					
						2014-01-23 18:17:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sbalineni 
							
						 
					 
					
						
						
						
						
							
						
						
							cc2b1c4961 
							
						 
					 
					
						
						
							
							Contrail plugin fixes -master branch, single commit, no transaction wrappers  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
					 
					
						2014-01-15 14:11:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6c1849f4bf 
							
						 
					 
					
						
						
							
							Fix Spring wiring issues in starting up MS.  
						
						 
						
						
						
						
					 
					
						2014-01-14 16:20:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sachchidanand Vaidya 
							
						 
					 
					
						
						
						
						
							
						
						
							0bff705621 
							
						 
					 
					
						
						
							
							Add L3VPN isolation method for contrail plugin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
					 
					
						2014-01-14 13:55:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							68b8891c62 
							
						 
					 
					
						
						
							
							Removed all reminants of the IdentityService.  Created the KeysManager to move the management  
						
						 
						
						... 
						
						
						
						of keys out of management server 
						
						
					 
					
						2014-01-14 13:11:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bae498c89e 
							
						 
					 
					
						
						
							
							Handle search of those entities without db view created using new ACL  
						
						 
						
						... 
						
						
						
						model. 
						
						
					 
					
						2014-01-13 21:55:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							af657b3d71 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5861: networks that failed to implement can not be destroyed  
						
						 
						
						... 
						
						
						
						introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java 
						
						
					 
					
						2014-01-13 23:28:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							50be9a447a 
							
						 
					 
					
						
						
							
							Apply proper license header and formatting to the new contrail tests  #2  
						
						 
						
						
						
						
					 
					
						2013-12-30 09:38:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4e88197459 
							
						 
					 
					
						
						
							
							Apply proper license header and formatting to the new contrail tests  
						
						 
						
						
						
						
					 
					
						2013-12-30 09:15:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sachchidanand Vaidya 
							
						 
					 
					
						
						
						
						
							
						
						
							7f9683af85 
							
						 
					 
					
						
						
							
							Added Virtual-Network and Virtual-Machine Model unit test.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2013-12-30 08:57:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							729a79e85c 
							
						 
					 
					
						
						
							
							Refactor db view based list apis to use new IAM acl search criteria.  
						
						 
						
						
						
						
					 
					
						2013-12-16 14:31:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						 
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							2774b62d64 
							
						 
					 
					
						
						
							
							Fixing bugs from Coverity related to Dereferenced Null after check and as return value.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2013-11-27 11:18:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							7a6751aa77 
							
						 
					 
					
						
						
							
							Make sure that if the file does not exist an Exception is thrown and that once it exists it is also closed after the properties are loaded.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2013-11-26 08:22:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							11c0c263f2 
							
						 
					 
					
						
						
							
							QueryChecker interface and ACL search criteria to be used for query api  
						
						 
						
						... 
						
						
						
						for entities with db views created. 
						
						
					 
					
						2013-11-22 16:36:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							433a631916 
							
						 
					 
					
						
						
							
							Reformat of source code to set a stable base for the future.  I couldn't get checkstyle enabled.  There's still about a thousand errors from checkstyle.  Most of it from length errors from comments and strings.  Will attempt to remove those tonight.  This change is so large I just want to get it in before any merge nightmares.  The changes are fairly minor though and I did a full compile and start a server with the reformat code.  
						
						 
						
						
						
						
					 
					
						2013-11-21 07:56:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cf715ff491 
							
						 
					 
					
						
						
							
							Bump 4.3.0 to 4.4.0 in master  
						
						 
						
						
						
						
					 
					
						2013-11-21 16:01:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d620df2bdd 
							
						 
					 
					
						
						
							
							Reformatted all of the code.  
						
						 
						
						
						
						
					 
					
						2013-11-21 06:15:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							224f479974 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						 
						
						
						
						
					 
					
						2013-11-21 04:08:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e4b22d0fca 
							
						 
					 
					
						
						
							
							Replace all tabs, particularly the ones in the comments  
						
						 
						
						
						
						
					 
					
						2013-11-21 03:39:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							e0d2423f06 
							
						 
					 
					
						
						
							
							Refactoring account_type for Domain_Admin and Normal_User types  
						
						 
						
						
						
						
					 
					
						2013-11-20 16:53:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							91e176cb0d 
							
						 
					 
					
						
						
							
							Fix a bug in listVm logic to use revokedIds and grantedIds.  
						
						 
						
						
						
						
					 
					
						2013-11-19 16:41:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							19e9849d86 
							
						 
					 
					
						
						
							
							Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.  
						
						 
						
						... 
						
						
						
						Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests 
						
						
					 
					
						2013-11-08 20:21:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							c06d8a750c 
							
						 
					 
					
						
						
							
							Fix for issues on Coverity related to IDs cv_1125383, cv_1125382, cv_1125380, cv_1125379, cv_1125378, cv_1125377, cv_1125376, cv_1125375, cv_1125374.  
						
						 
						
						... 
						
						
						
						Those bugs are related to classes not implementing Serializable, nox overriding the equals and/or hashCode methods and with empty finalize method.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2013-11-07 10:59:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							56070c644b 
							
						 
					 
					
						
						
							
							Fix for 1125389 RV: Bad use of return value - make sure the replace call is done after replaceAll and the correct value is returned  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2013-11-06 15:17:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ce3638bb03 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2013-11-04 15:49:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							479f404aea 
							
						 
					 
					
						
						
							
							Fix several rat issues introduced by recent commits  
						
						 
						
						
						
						
					 
					
						2013-11-04 20:14:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							143fbc37a6 
							
						 
					 
					
						
						
							
							fix build  
						
						 
						
						
						
						
					 
					
						2013-11-01 16:02:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pedro Marques 
							
						 
					 
					
						
						
						
						
							
						
						
							6b5fab2f5c 
							
						 
					 
					
						
						
							
							OpenContrail network plugin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2013-11-01 17:46:52 +01:00