Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							0f60b5d41c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack  
						
						 
						
						
						
						
					 
					
						2013-08-14 15:02:57 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c58f15d867 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4222: use new volume object in case of migrate volume  
						
						 
						
						
						
						
					 
					
						2013-08-13 15:16:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							da7f924cc5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4296: fix parameter setting error in listVirtualMachines command  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 72f013f7809db70755f0ff59f8c888d95d5179b5) 
						
						
					 
					
						2013-08-13 21:39:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							de2bd96d98 
							
						 
					 
					
						
						
							
							Moved volume related code into cloud-engine-orchestration  
						
						 
						
						
						
						
					 
					
						2013-08-12 19:06:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							0e19e82fac 
							
						 
					 
					
						
						
							
							Split up the volume manager into two.  One part is for self-service.  One part belongs in the engine.  Removed old 2.1 upgrade code.  In order to upgrade from 2.1, you must upgrade to 2.2. first.  So therefore these files are no necessary in the newer versions of CloudStack  
						
						 
						
						
						
						
					 
					
						2013-08-12 19:05:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3c16adf6dc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4142: listNetworkOfferings API has been changed to not return system-owned network offerings to regular-user. So, add networkofferingconservemode property to listNetworks API response.  
						
						 
						
						
						
						
					 
					
						2013-08-12 17:50:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							5cff9bd2e6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard  
						
						 
						
						... 
						
						
						
						only when there is portable IP range added at region level.
region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region. 
						
						
					 
					
						2013-08-12 18:12:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							8cf48ed2ce 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4179: [Performance Testing] Time taken for Deploy VM async job to complete is considerably higher  
						
						 
						
						... 
						
						
						
						The time increased due to the newly added dedicated resources feature. During regular VM deployment, all dedicated resources are put in avoid list so that they are not considered for deployment.
Now the way to compute the list of dedicated resources is not optimal and performance deteriorates in an environment having lot of pods, clusters and hosts as the logic is to query db. for each suc resource.
The fix is to optimize the logic not to loop through all resources but get the list of each resource type in a single query.
Conflicts:
	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java 
						
						
					 
					
						2013-08-09 16:57:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5495f10bce 
							
						 
					 
					
						
						
							
							Revert "Reverting the range of commits that broke the build"  
						
						 
						
						... 
						
						
						
						This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387. 
						
						
					 
					
						2013-08-08 15:02:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4976a67bfc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4193: don't let privateGateway to be created with NULL networkId  
						
						 
						
						
						
						
					 
					
						2013-08-08 10:49:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							b59e3aaefc 
							
						 
					 
					
						
						
							
							Reverting the range of commits that broke the build  
						
						 
						
						... 
						
						
						
						This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-08-08 14:46:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							a4400721bd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4182. Id field is not set in the xml response for DeployVirtualMachine/CreateVolume/CreateNetwork API's.  
						
						 
						
						
						
						
					 
					
						2013-08-08 14:35:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6a2c817bc 
							
						 
					 
					
						
						
							
							Unit test successful. Had to comment out a timing test from Amogh  
						
						 
						
						
						
						
					 
					
						2013-08-07 16:41:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5287f4c9ec 
							
						 
					 
					
						
						
							
							Got everything running through testing  
						
						 
						
						
						
						
					 
					
						2013-08-07 16:41:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5161ded69c 
							
						 
					 
					
						
						
							
							Removed the configuration parameters from Config.java  
						
						 
						
						
						
						
					 
					
						2013-08-07 16:41:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							49cd4fa380 
							
						 
					 
					
						
						
							
							Connected config gathering to CloudStack  
						
						 
						
						
						
						
					 
					
						2013-08-07 16:41:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							942f282a6e 
							
						 
					 
					
						
						
							
							Moved config into it's own package  
						
						 
						
						
						
						
					 
					
						2013-08-07 16:41:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							323f246765 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2955: [PortableIPrange deletePortableIpRange fails because of  
						
						 
						
						... 
						
						
						
						UI firing an incorrect API
adding 'portableiprange' tag to the job result of
CreatePortableIpRangeCmd api job response 
						
						
					 
					
						2013-08-06 16:01:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							5cfc69a7aa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3947: Fix similar issues related to getSyncObjType / getSyncObjId  
						
						 
						
						
						
						
					 
					
						2013-08-06 10:42:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							f17e6fc0a6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4097 2 optional parameters of addCluster API are not declared correctly  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-06 06:49:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0a0aae5f72 
							
						 
					 
					
						
						
							
							This reverts commit c4589e6ec7d2c34096644161824d80aa2d39ff93. Should not unescape queryFilter on server-side.  
						
						 
						
						
						
						
					 
					
						2013-08-05 15:06:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							151a7ee497 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes.  
						
						 
						
						
						
						
					 
					
						2013-08-02 18:16:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3e5a84a8bb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4053: Removal of AddSwiftCmd and ListSwiftsCmd APIs broke api  
						
						 
						
						... 
						
						
						
						back compatibility. 
						
						
					 
					
						2013-08-02 15:33:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9f3f13f70a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3748:AddS3Cmd NPE.  
						
						 
						
						
						
						
					 
					
						2013-08-02 13:53:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							a2f1d23378 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3748: AddS3Cmd NPE.  
						
						 
						
						
						
						
					 
					
						2013-08-02 13:53:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							66cca4d9ac 
							
						 
					 
					
						
						
							
							Fixed up the pom.xml to use dependencies specified in cloudstack pom  
						
						 
						
						
						
						
					 
					
						2013-08-02 13:51:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8930cfa983 
							
						 
					 
					
						
						
							
							Switched over to use the new jobs framework  
						
						 
						
						
						
						
					 
					
						2013-08-02 11:07:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							21f1b137cb 
							
						 
					 
					
						
						
							
							Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command  
						
						 
						
						... 
						
						
						
						Reviewed-by: Alena Prokharchyk
Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2013-08-01 13:36:20 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							871e3bb279 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3981. ListAccounts always sets 'networkTotal' to 0.  
						
						 
						
						... 
						
						
						
						Add vpc resource count to the response. And set the right values for network resource count. 
						
						
					 
					
						2013-08-01 14:18:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							d571b49d00 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3947: Override getSyncObjType and getSyncObjId in CreateLBStickinessPolicyCmd.java to prevent concurrent operations on Loadbalancer in a network  
						
						 
						
						
						
						
					 
					
						2013-08-01 10:04:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							51e4f597e0 
							
						 
					 
					
						
						
							
							fix CLOUDSTACK-3591 add usage recording for VM snapshots  
						
						 
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql 
						
						
					 
					
						2013-08-01 10:47:36 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a1dbb176 
							
						 
					 
					
						
						
							
							Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-31 15:31:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							2c53ede1de 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM  
						
						 
						
						
						
						
					 
					
						2013-07-31 15:07:17 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e1ee902a2 
							
						 
					 
					
						
						
							
							Moved over the new jobs framework from vmsync.  This has not been integrated into the server package yet.  Will do that next  
						
						 
						
						
						
						
					 
					
						2013-07-30 15:00:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9b7c4a6c47 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java 
						
						
					 
					
						2013-07-30 14:13:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Isaac Chiang 
							
						 
					 
					
						
						
						
						
							
						
						
							452176c0b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3935:Inconsistent json object name for image store api  
						
						 
						
						
						
						
					 
					
						2013-07-30 19:20:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Creasy 
							
						 
					 
					
						
						
						
						
							
						
						
							650de7998d 
							
						 
					 
					
						
						
							
							Fixing typo of "createing" that should be "creating"  https://issues.apache.org/jira/browse/CLOUDSTACK-3915  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 238815759664eb2a0e8c000389c976a8b1c5b269) 
						
						
					 
					
						2013-07-30 09:41:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a4cea4ebf2 
							
						 
					 
					
						
						
							
							Removed schema from the dependency of many components  
						
						 
						
						
						
						
					 
					
						2013-07-29 10:55:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							bcf239db08 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2715: Making MigrateSysteVm response uniform  
						
						 
						
						... 
						
						
						
						with responses on other systemVm apis. All systemVM apis return
SystemVmResponse - rebootSystemVm, stopSystemVm etc. MigrateSystemVm is
now made uniform.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-29 12:32:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							790a02f936 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3343 UI/API should also return the mode(Strict/Preferred) when listing the ServiceOffering that uses ImplicitDedicationPlanner  
						
						 
						
						... 
						
						
						
						Changes:
- API is fixed to return the service_offering details
Conflicts:
	api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java 
						
						
					 
					
						2013-07-28 22:44:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c8cafb91a7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3818: NFS Cache Improperly Named.  
						
						 
						
						
						
						
					 
					
						2013-07-26 15:07:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f5e5b39c9b 
							
						 
					 
					
						
						
							
							Moved the DB layer code into framework-db and change only the necessary projects to refer to it.  Cut down on the dependencies introduced with all the code in utils.  
						
						 
						
						
						
						
					 
					
						2013-07-26 15:02:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							24a8d60d6f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-62 [AWS Style Health Checks] Response of the API listLoadBalancerRuleInstances should show the service state of a VM if health check is configured for it  
						
						 
						
						
						
						
					 
					
						2013-07-26 16:40:26 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							9aaa378b08 
							
						 
					 
					
						
						
							
							Moved ClusterManager into it's own package.  Removed the agent load balancing code.  
						
						 
						
						
						
						
					 
					
						2013-07-25 19:00:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							45d38c4142 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3709:[Object_Store_Refactor][UI] Can't delete NFS Cache  
						
						 
						
						... 
						
						
						
						storage through UI.  Fixed at API side.
Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java 
						
						
					 
					
						2013-07-25 17:33:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b2cad5b698 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3709: Add the missing file.  
						
						 
						
						
						
						
					 
					
						2013-07-25 17:29:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							42738c2fda 
							
						 
					 
					
						
						
							
							change associatesUcsProfileToBlade to async api  
						
						 
						
						
						
						
					 
					
						2013-07-25 15:26:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							739f7cadeb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3764: [EIP/ELB] [BasicZone] Unable acquire IP as non-ROOT  
						
						 
						
						... 
						
						
						
						domain users
Since the basic zone network is owned by 'Root' domain, domain access
checkers will fail for the accounts in non-root domains while acquiring
public IP. So add an exception for the 'Basic' zone shared network with
EIP/ELB service. 
						
						
					 
					
						2013-07-25 19:17:39 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							555211a080 
							
						 
					 
					
						
						
							
							Moved Configuration from api to utils and moved the package.  This was done by eclipse so I only ran the unit test to verify everything is fine  
						
						 
						
						
						
						
					 
					
						2013-07-25 03:57:12 -07:00