Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3c965d0685 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations  
						
						
						
						
					 
					
						2013-12-18 16:14:07 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							719271b1d9 
							
						 
					 
					
						
						
							
							Fix tab and trailing spaces  
						
						
						
						
					 
					
						2013-12-16 15:15:30 -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 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6f1c14c2 
							
						 
					 
					
						
						
							
							ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and  
						
						
						
						
					 
					
						2013-12-12 16:31:00 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							5c12250dea 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX  
						
						... 
						
						
						
						1. Egress default policy rules is send to the firewall provider. It is up to the
    provider to configure the rules.
   2. The default policy rules are send for both allow and deny default policy.
   3. On network shutdown rules for delete are send.
   4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required. 
						
						
					 
					
						2013-12-10 14:19:03 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e79350d256 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3664:  
						
						... 
						
						
						
						scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check 
						
						
					 
					
						2013-12-09 15:40:17 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							98ee087d31 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4880:  
						
						... 
						
						
						
						check for host cpu capability while dynamic scaling a vm on the same host 
						
						
					 
					
						2013-12-05 14:31:27 -08:00 
						 
				 
			
				
					
						
							
							
								David Grizzanti 
							
						 
					 
					
						
						
						
						
							
						
						
							22422b9ddd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5022: NullPointerException when invalid zone is passed into UsageEventUtils  
						
						
						
						
					 
					
						2013-12-05 15:10:18 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bd6f706b72 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API  
						
						... 
						
						
						
						Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java 
						
						
					 
					
						2013-12-04 10:05:46 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							eaa250fd3c 
							
						 
					 
					
						
						
							
							Formatted again after all the tab expansions and eol removals  
						
						
						
						
					 
					
						2013-11-21 04:47:01 -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 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							62e9273581 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						
						
						
					 
					
						2013-11-21 03:12:05 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							278ef81a83 
							
						 
					 
					
						
						
							
							side-by-side VM sync management at manager level  
						
						
						
						
					 
					
						2013-11-20 17:59:38 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						
						
						
					 
					
						2013-11-20 07:26:53 -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 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							7095ea2b5e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4738 Dynamic compute offering.  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-07 12:41:20 +05:30 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							e3280bdba2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/spring-modularization'  
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2013-10-23 11:14:42 -07:00 
						 
				 
			
				
					
						
							
							
								dhoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c0c46268ac 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled  
						
						
						
						
					 
					
						2013-10-22 12:44:23 +02: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 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							aed5e9dc2a 
							
						 
					 
					
						
						
							
							Add Manage Context framework  
						
						... 
						
						
						
						The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP. 
						
						
					 
					
						2013-10-02 13:09:52 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							832db1b398 
							
						 
					 
					
						
						
							
							Apply  https://reviews.apache.org/r/14084/  
						
						
						
						
					 
					
						2013-09-17 16:29:48 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a05ec6df33 
							
						 
					 
					
						
						
							
							Fixed up the agent separation.  Added comments for config packaging.  
						
						
						
						
					 
					
						2013-09-06 15:40:39 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8f556e6d88 
							
						 
					 
					
						
						
							
							Made changes to configuration.  Eliminated ConfigValue and only use ConfigKey  
						
						
						
						
					 
					
						2013-09-06 15:40:38 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b8e79c30a8 
							
						 
					 
					
						
						
							
							Compile complete  
						
						
						
						
					 
					
						2013-09-06 15:40:37 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6e8ca99466 
							
						 
					 
					
						
						
							
							Got all of the config stuff out of the way  
						
						
						
						
					 
					
						2013-09-06 15:40:36 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							435e74e914 
							
						 
					 
					
						
						
							
							Commit to try something on removing getZone  
						
						
						
						
					 
					
						2013-09-06 15:40:33 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2e5bb63f77 
							
						 
					 
					
						
						
							
							Moved NetworkManagerImpl to NetworkOrchestrator  
						
						
						
						
					 
					
						2013-09-06 15:40:32 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8930cfa983 
							
						 
					 
					
						
						
							
							Switched over to use the new jobs framework  
						
						
						
						
					 
					
						2013-08-02 11:07:55 -07:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							8225374138 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.3.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chipchilders@apache.org> 
						
						
					 
					
						2013-08-01 10:35:00 -04:00 
						 
				 
			
				
					
						
							
							
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							aa131525ba 
							
						 
					 
					
						
						
							
							Added missing files  
						
						
						
						
					 
					
						2013-07-16 11:24:21 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Spindler 
							
						 
					 
					
						
						
						
						
							
						
						
							469c4dd139 
							
						 
					 
					
						
						
							
							Removing ^M's from code.  
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-04-04 00:53:20 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							80d58b6c73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-20 16:42:56 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							573d13dd7c 
							
						 
					 
					
						
						
							
							starting unit test  
						
						
						
						
					 
					
						2012-11-20 18:57:19 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							dd198ffd4f 
							
						 
					 
					
						
						
							
							Added a war for cloud-engine  
						
						
						
						
					 
					
						2012-11-16 08:47:58 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a06eb4557e 
							
						 
					 
					
						
						
							
							refactor apis  
						
						
						
						
					 
					
						2012-11-13 16:34:44 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a6df8a5b44 
							
						 
					 
					
						
						
							
							Added engine  
						
						
						
						
					 
					
						2012-11-05 09:14:14 -08:00