Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							a509f94544 
							
						 
					 
					
						
						
							
							Adding SecurityChecker list for the ParamProcessWorker  
						
						 
						
						
						
						
					 
					
						2014-04-04 16:38:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							99bdc8d875 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-03-13 11:05:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							c211f0bbbe 
							
						 
					 
					
						
						
							
							Dispatcher corrections, refactoring and tests  
						
						 
						
						... 
						
						
						
						Corrects problems from previous attempt. Fixes based on help comments from
the community and conflict resolution
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-03-07 19:12:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3b58a45e04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-02-07 13:43:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							782c530685 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6003 fixing plus refactoring dispatcher" as it breaks API dispatching for commands having Map<String,String> as a parameter type  
						
						 
						
						... 
						
						
						
						This reverts commit 447430c3df38c36d947c44c4aebd961d8cbb14c4.
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2014-02-06 14:46:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							54f32a8e46 
							
						 
					 
					
						
						
							
							Moved the controlling logic for secondary storage vm into place  
						
						 
						
						
						
						
					 
					
						2014-02-05 01:39:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							447430c3df 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6003 fixing plus refactoring dispatcher  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit a9bcc1ea3b7dfd3fcc5c795b0095c77851ebe618)
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-02-04 13:37:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6c1849f4bf 
							
						 
					 
					
						
						
							
							Fix Spring wiring issues in starting up MS.  
						
						 
						
						
						
						
					 
					
						2014-01-14 16:20:30 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							f8681de07c 
							
						 
					 
					
						
						
							
							Invalid reference to a class which has been moved  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-01-14 15:13:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ecd9ed31 
							
						 
					 
					
						
						
							
							Removing the AclServiceImpl old bean entry  
						
						 
						
						
						
						
					 
					
						2014-01-11 01:01:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							1c0b8db01b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4941:  
						
						 
						
						... 
						
						
						
						Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics 
						
						
					 
					
						2013-12-18 16:27:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							afcf967d24 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-4941:"  
						
						 
						
						... 
						
						
						
						This reverts commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771. 
						
						
					 
					
						2013-12-18 16:01:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							231e7c01f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4941:  
						
						 
						
						... 
						
						
						
						During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics 
						
						
					 
					
						2013-12-18 14:58:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9d3827e6fe 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: refactor VM work job dispatcher to allow volume/snapshot manager to participate serialized job handling  
						
						 
						
						
						
						
					 
					
						2013-12-16 15:15:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							aa72b76aec 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: put system vm work under new vmsync model  
						
						 
						
						
						
						
					 
					
						2013-12-06 16:53:11 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							6bea532efa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5206: Ability to control the external id of first  
						
						 
						
						... 
						
						
						
						class objects. Putting in the generic methods and trying it
 for objects like vm, volume. This is the first cut 
						
						
					 
					
						2013-11-26 09:52:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							1f7ef652cf 
							
						 
					 
					
						
						
							
							Make com.cloud.network.vpn.RemoteAccessVpnService an extensible type  
						
						 
						
						
						
						
					 
					
						2013-11-14 15:31:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Syed 
							
						 
					 
					
						
						
						
						
							
						
						
							0076307863 
							
						 
					 
					
						
						
							
							Squashed merge of Ssl Termination feature  
						
						 
						
						... 
						
						
						
						Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821 
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support 
This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.
The following are the new API's that this patch adds
uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer
Unit tests are also included in the patch. 
						
						
					 
					
						2013-11-08 16:49:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2ef4d5200c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2013-10-31 17:16:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ad74948480 
							
						 
					 
					
						
						
							
							Move LockMasterListener initialization to system context  
						
						 
						
						... 
						
						
						
						This reverts commit d178b25daa484dda44bb34e63cb719d1c3cc1519 and moves
the initialization to the system context, which really where it should have
been from the beginning. 
						
						
					 
					
						2013-10-25 15:11:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							a77435dab5 
							
						 
					 
					
						
						
							
							Add missing extensible type registries  
						
						 
						
						... 
						
						
						
						The following types were not setup to discover extensions
com.cloud.network.element.FirewallServiceProvider
com.cloud.network.element.PortForwardingServiceProvider
com.cloud.network.element.StaticNatServiceProvider
com.cloud.network.element.NetworkACLServiceProvider
com.cloud.network.element.LoadBalancingServiceProvider
com.cloud.network.element.Site2SiteVpnServiceProvider 
						
						
					 
					
						2013-10-24 20:20:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							891b85d516 
							
						 
					 
					
						
						
							
							Add missing licenses  
						
						 
						
						
						
						
					 
					
						2013-10-23 15:20:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							c9101966e0 
							
						 
					 
					
						
						
							
							Added StorageStrategyFactory to centralize and deduplicate some logic  
						
						 
						
						
						
						
					 
					
						2013-10-23 12:40:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							c9a9a3b7b3 
							
						 
					 
					
						
						
							
							Make SnapshotStrategy and DataMotionStrategy discovered and registered  
						
						 
						
						
						
						
					 
					
						2013-10-03 17:03:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							67186429e1 
							
						 
					 
					
						
						
							
							Spring Modularization  
						
						 
						
						... 
						
						
						
						ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.
Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors. 
						
						
					 
					
						2013-10-02 15:41:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							95011d6bf3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1818: add a missing file that is missed in previous patch  
						
						 
						
						
						
						
					 
					
						2013-03-29 11:12:36 -07:00