Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							b6727e5646 
							
						 
					 
					
						
						
							
							CLOUDSTACK-299: Egress firewall rules feature for guest network on VR  
						
						
						
						
					 
					
						2013-01-31 11:20:47 +05:30 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f57cbaacd6 
							
						 
					 
					
						
						
							
							IPv6: Fix VlanIpRangeResponse  
						
						
						
						
					 
					
						2013-01-30 20:01:04 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b1972f6c11 
							
						 
					 
					
						
						
							
							IPv6: Update NetworkResponse and NicResponse  
						
						
						
						
					 
					
						2013-01-29 22:01:31 -08:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							def9fd1f2e 
							
						 
					 
					
						
						
							
							remove finduser, findaccount, finddomain APIs  
						
						
						
						
					 
					
						2013-01-28 17:04:25 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							c6ae19d12f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into regions  
						
						
						
						
					 
					
						2013-01-25 18:49:47 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							de20cb6c1a 
							
						 
					 
					
						
						
							
							Apply API refactoring changes. Make changes to Regions API to work with new code  
						
						
						
						
					 
					
						2013-01-25 18:45:01 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							1f57d925eb 
							
						 
					 
					
						
						
							
							Apply API refactoring changes. Make changes to Regions API to work with new code  
						
						
						
						
					 
					
						2013-01-25 18:41:59 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							356866c72b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into javelin  
						
						... 
						
						
						
						- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-24 19:18:53 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							26be5ce2df 
							
						 
					 
					
						
						
							
							CLOUDSTACK-355: create DB view for ZoneResponse to fix count for  
						
						... 
						
						
						
						listZonesByCmd. 
						
						
					 
					
						2013-01-22 16:39:45 -08:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							aa7b3e0f6d 
							
						 
					 
					
						
						
							
							Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId  
						
						... 
						
						
						
						Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case. 
						
						
					 
					
						2013-01-22 12:56:39 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4fbecf15ec 
							
						 
					 
					
						
						
							
							add unit test back, primary storage life cycle is tested  
						
						
						
						
					 
					
						2013-01-21 17:01:00 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6e40c33628 
							
						 
					 
					
						
						
							
							CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count  
						
						... 
						
						
						
						for ListServiceOfferingsCmd. 
						
						
					 
					
						2013-01-21 15:25:49 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6db719d58b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-355: Create DB view to fix count issue for  
						
						... 
						
						
						
						listDiskOfferingsCmd. 
						
						
					 
					
						2013-01-21 10:50:10 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							df684261cf 
							
						 
					 
					
						
						
							
							Put command classes under Spring injection framework  
						
						
						
						
					 
					
						2013-01-15 18:07:19 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							8eba0ee0bb 
							
						 
					 
					
						
						
							
							ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-11 18:44:20 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7f8262d45e 
							
						 
					 
					
						
						
							
							Remove IdentityProxy and IdentityTypeAdapter class.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-09 17:40:58 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9924b64830 
							
						 
					 
					
						
						
							
							commit 3a3cb60e85c0254ebceff55d0b210ca1ff5386a6  
						
						... 
						
						
						
						Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Wed Jan 9 11:54:25 2013 +0530
    CLOUDSTACK-614: ListTemplates API is not returning "Enable SSH Key" attribute for any given template. Update the TemplateResponse by adding 'sshkeyenabled' attribute to it. This attribute is set to the value that the user passes as input for parameter 'sshkeyenabled' while registering the template.
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-09 10:42:44 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							74c15a22a0 
							
						 
					 
					
						
						
							
							Create DB view for ListStoragePools API performance optimization.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-08 12:33:18 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ed0637b8c2 
							
						 
					 
					
						
						
							
							api: Refactor move acl to org.apache.cloudstack  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-06 15:30:58 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							f07a98a740 
							
						 
					 
					
						
						
							
							api: Refactor and move s3 to api.command.admin.storage  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-05 15:30:38 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5119785cf7 
							
						 
					 
					
						
						
							
							Get latest changes, merge branch 'master' into api_refactoring  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-04 22:21:20 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							177e157cbf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-306: Move inline mode parameter from device to network offering  
						
						... 
						
						
						
						One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base. 
						
						
					 
					
						2013-01-04 19:17:58 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							daeb4abcca 
							
						 
					 
					
						
						
							
							Create DB views for AsyncJobResponse to speed up listAsyncJobsCmd.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-03 15:35:26 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ebfb90e217 
							
						 
					 
					
						
						
							
							Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-02 17:38:58 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							21c1623a03 
							
						 
					 
					
						
						
							
							Create DB view for Volume to speed up ListVolumesCmd.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-25 17:08:50 -08:00 
						 
				 
			
				
					
						
							
							
								Isaac Chiang 
							
						 
					 
					
						
						
						
						
							
						
						
							5aefd77f77 
							
						 
					 
					
						
						
							
							Fix for CloudStack-648  
						
						... 
						
						
						
						Signed-off-by: Gavin Lee <gavin.lxh@gmail.com> 
						
						
					 
					
						2012-12-26 00:00:58 +08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							296b49c2f8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into test-merge-api  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-23 13:54:46 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e7fa1a86fb 
							
						 
					 
					
						
						
							
							Create DB views to improve ListHostsCmd performance.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-22 21:47:05 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b14b39a69f 
							
						 
					 
					
						
						
							
							Remove IdentityProxy from BaseResponse, ExtractResponse. Now  
						
						... 
						
						
						
						IdentityProxy is only referenced in CreateCmdResponse, which involves
some async job logic change. Since it is not impacting list performance,
will leave it there for now.
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-20 16:52:52 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e397f23f6b 
							
						 
					 
					
						
						
							
							Revert "Guard null pointer exceptions."  
						
						... 
						
						
						
						This reverts commit fc56e29a3ec22035c744e276538e8a20e5923996.
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-19 11:23:09 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							1d729578d4 
							
						 
					 
					
						
						
							
							Remove IdentityProxy from Response classes.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-18 23:16:38 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							fc56e29a3e 
							
						 
					 
					
						
						
							
							Guard null pointer exceptions.  
						
						
						
						
					 
					
						2012-12-18 22:26:38 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							434258080f 
							
						 
					 
					
						
						
							
							api: Fix NullPointerException in ApiResponseHelper for DomainResponse  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-18 17:44:17 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							4b75132aa2 
							
						 
					 
					
						
						
							
							Remove IdentityProxy from Response classes.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-18 16:33:12 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							16be94e9d7 
							
						 
					 
					
						
						
							
							Remove IdentityProxy from OfferingResponse, FirewallResponse,  
						
						... 
						
						
						
						FirewallRuleResponse, HypervisorCapabilitiesResponse, IPAddressResponse.
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-18 12:02:08 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa30f03e7 
							
						 
					 
					
						
						
							
							Remove IdentityProxy from AutoScale responses.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-18 11:19:36 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3d344738b1 
							
						 
					 
					
						
						
							
							Fix ControlledEntityResponse interface to remove IdentityProxy for  
						
						... 
						
						
						
						projectId and domainId.
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-17 23:24:08 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							79f8c104eb 
							
						 
					 
					
						
						
							
							Remove IdentityProxy from GuestOSResponse and GuestOSCategoryResponse.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-17 18:01:31 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e017dc2c00 
							
						 
					 
					
						
						
							
							commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44  
						
						... 
						
						
						
						Author: Min Chen <min.chen@citrix.com>
Date:   Mon Dec 17 17:42:30 2012 -0800
    Remove IdentityProxy from AlertResponse and AsyncJobResponse.
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-17 17:44:39 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							348d3ae448 
							
						 
					 
					
						
						
							
							Conflicts:  
						
						... 
						
						
						
						api/src/org/apache/cloudstack/api/response/AccountResponse.java
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-17 15:41:56 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c167ad45e3 
							
						 
					 
					
						
						
							
							Move view based VO and Dao classes to cloud-server module to hide the  
						
						... 
						
						
						
						details from API client, also extract query related methods into
QueryService interface. 
						
						
					 
					
						2012-12-14 10:47:58 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b70c1a5a84 
							
						 
					 
					
						
						
							
							Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones.  
						
						
						
						
					 
					
						2012-12-13 23:18:37 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							88b7af18e6 
							
						 
					 
					
						
						
							
							api: Revert "Move all the DB view DAOs from cloud-server to cloud-api for future api-server package."  
						
						... 
						
						
						
						Reverting commit as we don't want the daos to move to cloud-api.
We'll eventually breakout cloud-server and create cloud-api-server for the standalone
api server.
This reverts commit 7597a38f7a255e49b73c833918f30b51504e0c53. 
						
						
					 
					
						2012-12-13 09:42:28 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7597a38f7a 
							
						 
					 
					
						
						
							
							Move all the DB view DAOs from cloud-server to cloud-api for future api-server package.  
						
						... 
						
						
						
						BUG-ID: CLOUDSTACK-527
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-13 09:28:42 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							472f4f91b9 
							
						 
					 
					
						
						
							
							Refactor ListProjectInvitationsCmd and ProjectInvitationResponse.  
						
						
						
						
					 
					
						2012-12-12 09:04:43 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9c93fee0dc 
							
						 
					 
					
						
						
							
							Refactor ListProjectAccountCmd and ProjectAccountResponse.  
						
						
						
						
					 
					
						2012-12-11 15:49:15 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8735716ba0 
							
						 
					 
					
						
						
							
							Refactor ListProjectsCmd and ProjectResponse.  
						
						
						
						
					 
					
						2012-12-11 12:51:08 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c83323fea7 
							
						 
					 
					
						
						
							
							api: Refactoring ListUsersCmd and UserResponse.  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-10 17:45:40 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bba96254f5 
							
						 
					 
					
						
						
							
							Refactoring ListVMGroupsCmd and InstanceGroupResponse.  
						
						
						
						
					 
					
						2012-12-10 13:59:20 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							e398b1e47a 
							
						 
					 
					
						
						
							
							api: Refactor command and response classes to org.apache.cloudstack.api.*  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 19:23:24 -08:00