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 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							da6e81aa21 
							
						 
					 
					
						
						
							
							api_refactoring: Fix build issues and incorrect imports  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 13:48:20 -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 
						 
				 
			
				
					
						
							
							
								Vijay 
							
						 
					 
					
						
						
						
						
							
						
						
							dda4d39b55 
							
						 
					 
					
						
						
							
							AutoScale changes in Apache master  
						
						
						
						
					 
					
						2012-11-16 10:56:44 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							3f5733cea7 
							
						 
					 
					
						
						
							
							CS-16412: fixed count for following commands:  
						
						... 
						
						
						
						listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes
Conflicts:
	api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
	api/src/com/cloud/api/commands/ListConditionsCmd.java
	api/src/com/cloud/api/commands/ListCountersCmd.java
	api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
	api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
	api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
	api/src/com/cloud/network/as/AutoScaleService.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/as/dao/CounterDao.java
	server/src/com/cloud/network/as/dao/CounterDaoImpl.java
	server/src/com/cloud/projects/ProjectManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 
					
						2012-10-15 18:16:59 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8f2d9a09e5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands  
						
						... 
						
						
						
						Fixes the count in commands:
listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes
Conflicts:
	api/src/com/cloud/api/commands/ListVMsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java 
						
						
					 
					
						2012-10-12 13:58:59 -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 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							acd08e61e6 
							
						 
					 
					
						
						
							
							CS-16239: don't try to pull key information if the key was removed in the system  
						
						... 
						
						
						
						As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user
Conflicts:
	server/src/com/cloud/api/ApiDBUtils.java 
						
						
					 
					
						2012-09-11 14:37:25 -07:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							196885e378 
							
						 
					 
					
						
						
							
							cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object).  
						
						
						
						
					 
					
						2012-07-23 14:20:43 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							353423acec 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 
					
						2012-07-06 12:04:10 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7acf8585b1 
							
						 
					 
					
						
						
							
							Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed  
						
						... 
						
						
						
						2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java 
						
						
					 
					
						2012-07-06 11:43:31 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							31f9d718fb 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java 
						
						
					 
					
						2012-07-03 17:32:50 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							da6d876cd4 
							
						 
					 
					
						
						
							
							VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java 
						
						
					 
					
						2012-07-03 17:23:40 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							e87558256c 
							
						 
					 
					
						
						
							
							Patch from Chip Childers  
						
						... 
						
						
						
						https://reviews.apache.org/r/5704/ 
License header updates for the server folder 
					
						2012-07-02 09:51:21 -04:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							634cd78baa 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript 
						
						
					 
					
						2012-06-28 17:41:40 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							55a12582b4 
							
						 
					 
					
						
						
							
							Completed API / Management server code for Resource tags feature. UI is yet to be done  
						
						
						
						
					 
					
						2012-06-20 15:45:08 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							62d45b9670 
							
						 
					 
					
						
						
							
							Initial checkin for resource tags feature  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-06-20 15:45:08 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							810151586b 
							
						 
					 
					
						
						
							
							1) Allow having multiple shared networks with the same vlan  
						
						... 
						
						
						
						2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java 
						
						
					 
					
						2012-06-15 16:47:13 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							60b52f90dd 
							
						 
					 
					
						
						
							
							Initial checkin for VPC feature:  
						
						... 
						
						
						
						1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd
2) New db tables:
* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`
and corresponding VO/Dao objects.
Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC
3) New Manager and Service interfaces- VpcManager/VpcService
4) Automatically create new VpcOffering (if doesn't exist) on system start
5) New Action events:
* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE
* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-06-15 13:53:59 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							07cbec95fa 
							
						 
					 
					
						
						
							
							bug CS-14957: Return hypervisor type for uploaded volume  
						
						
						
						
					 
					
						2012-05-17 19:22:19 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							9097b53eab 
							
						 
					 
					
						
						
							
							bug CS-10789: Put zone id in the volumehost ref table. make list volume to show the percent uploaded.  
						
						
						
						
					 
					
						2012-05-03 10:46:02 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							676a28177b 
							
						 
					 
					
						
						
							
							Added one more parameter - haHost(boolean) - to listHosts api command. The parameter identifies if the host is dedicated for ha only  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-04-12 11:50:36 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fec3a87d09 
							
						 
					 
					
						
						
							
							bug 14388: don't return console proxy / ssvm service offerings  
						
						... 
						
						
						
						status 14388: resolved fixed 
						
						
					 
					
						2012-03-19 14:50:09 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4d27f3c44b 
							
						 
					 
					
						
						
							
							bug 13866: return publicIp info in listVms api response when vm is linked to public ip via static nat  
						
						... 
						
						
						
						Reviewed-by: Frank 
						
						
					 
					
						2012-02-17 15:42:17 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c581506103 
							
						 
					 
					
						
						
							
							bug 12306: list* command revamp  
						
						
						
						
					 
					
						2012-01-09 10:07:42 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							89ca2fe48e 
							
						 
					 
					
						
						
							
							bug 12656: Add restriction for network update and new rules  
						
						... 
						
						
						
						status 12656: resolved fixed 
						
						
					 
					
						2012-01-05 21:08:41 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d4e0fbda83 
							
						 
					 
					
						
						
							
							bug 12686: added search by zoneId to the listNetworkOfferings  
						
						
						
						
					 
					
						2012-01-04 12:31:59 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							8098045645 
							
						 
					 
					
						
						
							
							set account details to null in listAccountCmd when there is no details  
						
						
						
						
					 
					
						2011-12-12 15:55:39 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2902f3d8bd 
							
						 
					 
					
						
						
							
							Update service offering id in the NetworkServiceOfferingResponse  
						
						
						
						
					 
					
						2011-12-06 16:51:47 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a4773b7080 
							
						 
					 
					
						
						
							
							bug 12291: listVms - show non-project resources only if no projectId specified  
						
						... 
						
						
						
						status 12291: resolved fixed 
						
						
					 
					
						2011-12-02 15:17:50 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							cdd94c1b9a 
							
						 
					 
					
						
						
							
							bug 11811: Introduce a global config to disable extraction altogether for all users except root admin. Make changes so that volumes are based out of ISO. Take care of upgrade as well for this global config.  
						
						... 
						
						
						
						Reviewed by : Kishan. 
						
						
					 
					
						2011-11-24 00:12:24 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e034e3d7a3 
							
						 
					 
					
						
						
							
							Revert "bug 11811: Changing permissions for extraction of volumes based out of isos."  
						
						... 
						
						
						
						This reverts commit 9ed2be7ecda7c0bad05aec8e0213e95507ad9be6. 
						
						
					 
					
						2011-11-23 18:38:37 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							38b25f3466 
							
						 
					 
					
						
						
							
							bug 11289: return only Free ip addresses as available Ips as a part of listAccounts  
						
						... 
						
						
						
						status 11289: resolved fixed 
						
						
					 
					
						2011-11-22 15:25:45 -08:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							488ac8238e 
							
						 
					 
					
						
						
							
							bug 11311: lis host takes in a additional parameter to fine tune the details, the default behavious is still unchanged.  
						
						
						
						
					 
					
						2011-11-22 16:26:52 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							57aa7dec91 
							
						 
					 
					
						
						
							
							bug 11811: Changing permissions for extraction of volumes based out of isos.  
						
						... 
						
						
						
						As per the new design following would be done.
(a) any ISO-derived disk can be extracted
(b) there will be a global config to disable  extraction of ISO based volumes.
That way people concerned about (a) can just use (b) to fix it.
Reviewed by : Kishan.
status 11811: resolved fixed 
						
						
					 
					
						2011-11-21 16:58:09 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							061ff36434 
							
						 
					 
					
						
						
							
							bug 11814: TemplateResponse now returns template details info  
						
						
						
						
					 
					
						2011-11-18 16:40:32 -08:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							b0cdb86d9e 
							
						 
					 
					
						
						
							
							Merging listSupportedNetworkServices and listSupportedNetworkServiceProviders.  
						
						... 
						
						
						
						listSupportedNetworkServiceProviders returs list of services with providers and capabilities of each service.
It supports 2 parameters:
-service : list providers and capabilities of this service
-provider: list services of this provider
- if none is specified, lists all services supported 
						
						
					 
					
						2011-11-17 12:54:31 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bb2a8cf7ea 
							
						 
					 
					
						
						
							
							NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param  
						
						
						
						
					 
					
						2011-11-14 18:13:47 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fcaa49ec 
							
						 
					 
					
						
						
							
							Merge complete except for virtualnetworkappliancemanager  
						
						
						
						
					 
					
						2011-11-10 15:18:16 -08:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							3a845d2d75 
							
						 
					 
					
						
						
							
							Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created)  
						
						
						
						
					 
					
						2011-11-07 16:16:03 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d6db4a686e 
							
						 
					 
					
						
						
							
							Bug 11313 - Add an account param/detail/map in the XXXAccount API calls  
						
						... 
						
						
						
						status 11313: resolved fixed 
						
						
					 
					
						2011-11-07 14:24:36 -08:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							6aa743165a 
							
						 
					 
					
						
						
							
							Changes  to support Enable/ Disable services of a service provider added to physical network:  
						
						... 
						
						
						
						- ListSupportedNetworkServiceProvidersCmd will now return Providers along with its element's services and boolean 'canEnableIndividualServices' that indicates if for this Provider services can be enabled/disabled
- add & update NetworkServiceProvider changed to take in the list of services to enable. While adding a provider, if list is null then all services supported by the element are enabled by default.
- ListNetworkServices enhanced to take in a provider name and returns services of that specific provider. 
						
						
					 
					
						2011-11-01 18:03:55 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							46dac852fa 
							
						 
					 
					
						
						
							
							Merge branch 'swift'  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2011-10-31 15:04:48 -07:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							07e44e3a23 
							
						 
					 
					
						
						
							
							bug 11311: change list vm call to provide less info  
						
						
						
						
					 
					
						2011-10-30 16:25:57 +05:30 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2b039530c0 
							
						 
					 
					
						
						
							
							Swift : list Template  
						
						
						
						
					 
					
						2011-10-28 16:07:31 -07:00