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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							af28c06998 
							
						 
					 
					
						
						
							
							api: move and group all under command, org.apache.cloudstack.command.*  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 18:30:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							30941c2d31 
							
						 
					 
					
						
						
							
							api: Refactoring ListEventsCmd and EventResponse, and create Event db view.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 16:54:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							acf7afd7f5 
							
						 
					 
					
						
						
							
							api: Refactor ResourceTagResponse and ListTagsCmd, add db view for ResourceTag.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 09:57:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8a313d7f84 
							
						 
					 
					
						
						
							
							api: SecurityGroupResponse and SecurityGroupRuleResponse refactoring  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 16:04:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b0ce8fd4ff 
							
						 
					 
					
						
						
							
							api: Optimize and improve api, db call perfomance  
						
						 
						
						... 
						
						
						
						This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-05 20:06:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							b673c21174 
							
						 
					 
					
						
						
							
							api_refactor: refactor job (async jobs) apis  
						
						 
						
						... 
						
						
						
						- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-04 00:12:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc3bc3760 
							
						 
					 
					
						
						
							
							api_refactor: refactor vpn and vm apis  
						
						 
						
						... 
						
						
						
						- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 21:27:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5edfc2760a 
							
						 
					 
					
						
						
							
							refactor: remove redundant imports, fix trailing chars  
						
						 
						
						
						
						
					 
					
						2012-12-03 13:54:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vijay Venkatachalam 
							
						 
					 
					
						
						
						
						
							
						
						
							aea87da410 
							
						 
					 
					
						
						
							
							Autoscale:Sending the Counter params as list  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-11-16 11:07:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vijay Venkatachalam 
							
						 
					 
					
						
						
						
						
							
						
						
							affc162556 
							
						 
					 
					
						
						
							
							AutoScale: Fixing issues that occurred during rebase with master  
						
						 
						
						
						
						
					 
					
						2012-11-16 11:04:37 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vijay Venkatachalam 
							
						 
					 
					
						
						
						
						
							
						
						
							527b5c8ee2 
							
						 
					 
					
						
						
							
							Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep  
						
						 
						
						
						
						
					 
					
						2012-11-16 10:57:00 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vijay 
							
						 
					 
					
						
						
						
						
							
						
						
							dda4d39b55 
							
						 
					 
					
						
						
							
							AutoScale changes in Apache master  
						
						 
						
						
						
						
					 
					
						2012-11-16 10:56:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							f0f33bf4da 
							
						 
					 
					
						
						
							
							Added Mock ApiServer, Regions API calls with api keys  
						
						 
						
						
						
						
					 
					
						2012-10-17 14:16:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1d458c7a2d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-347: ipAddressResponse/NetworkResponse API - return vlan info only when the caller is ROOT admin  
						
						 
						
						
						
						
					 
					
						2012-10-15 11:39:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							be2017849a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process.  
						
						 
						
						
						
						
					 
					
						2012-10-05 15:10:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							89779cceb8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into regions  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-10-03 14:09:01 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							4fcf64dd74 
							
						 
					 
					
						
						
							
							updated regions branch with changes from master  
						
						 
						
						
						
						
					 
					
						2012-09-27 17:04:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							65eeeaf071 
							
						 
					 
					
						
						
							
							CS-14277  
						
						 
						
						... 
						
						
						
						Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010) 
						
						
					 
					
						2012-09-11 17:22:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							8c3450b503 
							
						 
					 
					
						
						
							
							CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI.  
						
						 
						
						
						
						
					 
					
						2012-08-28 13:52:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e252de4999 
							
						 
					 
					
						
						
							
							PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address  
						
						 
						
						... 
						
						
						
						Reviewed-by: Frank Zhang
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-08-21 15:35:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							335730dc65 
							
						 
					 
					
						
						
							
							CS-15999: added nics to domain router api response  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-08-16 10:50:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b5103c501 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:19:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b92d2336ad 
							
						 
					 
					
						
						
							
							VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:  
						
						 
						
						... 
						
						
						
						http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec 
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java 
						
						
					 
					
						2012-08-01 18:57:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5cbe3d9722 
							
						 
					 
					
						
						
							
							ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/ListVPCsCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java 
						
						
					 
					
						2012-08-01 18:54:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							48102871e9 
							
						 
					 
					
						
						
							
							VPC: add account/domain info to the API vpc response  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-08-01 18:48:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7706a9c32f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2012-07-31 13:37:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							67941f818d 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API  
						
						 
						
						
						
						
					 
					
						2012-07-30 15:52:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							36fc2bd9b5 
							
						 
					 
					
						
						
							
							CS-15044:API changes and UI changes to provide option to view the name of the guestnetwork a virtual machine belongs  
						
						 
						
						
						
						
					 
					
						2012-07-31 02:57:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							72a4b2f410 
							
						 
					 
					
						
						
							
							S2S VPN: Add name field for customer gateway  
						
						 
						
						... 
						
						
						
						Easier for user to identify the correct gateway 
						
						
					 
					
						2012-07-27 16:27:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							766b7a2706 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-07-23 16:38:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7d68e33323 
							
						 
					 
					
						
						
							
							S2S VPN: Use source NAT ip address for VPN gateway  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-07-23 14:44:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							671475242c 
							
						 
					 
					
						
						
							
							S2S VPN: Add domain and account for VPN  
						
						 
						
						... 
						
						
						
						Admin can add VPN connection for others
Conflicts:
	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-07-23 14:40:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							230ce1dfee 
							
						 
					 
					
						
						
							
							S2S VPN: Add state for vpn connection response  
						
						 
						
						
						
						
					 
					
						2012-07-23 14:38:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							830901d7cc 
							
						 
					 
					
						
						
							
							cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object).  
						
						 
						
						
						
						
					 
					
						2012-07-23 14:21:10 -07:00