etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud/network
History
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
..
element S2S VPN: Fix license headers 2012-08-14 09:53:39 -07:00
firewall CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
guru committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
lb CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
router Support for adding private network 2012-06-15 14:20:34 -07:00
rules CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
security CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
vpc CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
vpn CS-16412: fixed count for following commands: 2012-10-15 18:16:59 -07:00
IpAddress.java 1) Added start logic to the VPC 2012-06-15 13:56:05 -07:00
Network.java Submit Midokura SDN controller stubs 2012-08-13 18:55:11 +05:30
NetworkProfile.java Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used. 2012-06-15 13:54:48 -07:00
NetworkService.java CS-16412: fixed count for following commands: 2012-10-15 18:16:59 -07:00
Networks.java Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
PhysicalNetwork.java Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
PhysicalNetworkServiceProvider.java VPC: added field networkacl_service_provided to physical_network_service_providers table 2012-07-06 11:08:39 -07:00
PhysicalNetworkSetupInfo.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
PhysicalNetworkTrafficType.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
PublicIpAddress.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
RemoteAccessVpn.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
Site2SiteCustomerGateway.java S2S VPN: Fix license headers 2012-08-14 09:53:39 -07:00
Site2SiteVpnConnection.java S2S VPN: Fix license headers 2012-08-14 09:53:39 -07:00
Site2SiteVpnGateway.java S2S VPN: Fix license headers 2012-08-14 09:53:39 -07:00
StorageNetworkService.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
VirtualNetworkApplianceService.java VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip) 2012-06-15 14:31:58 -07:00
VirtualRouterProvider.java Support for adding private network 2012-06-15 14:20:34 -07:00
VpcVirtualNetworkApplianceService.java VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 2012-08-03 14:23:45 -07:00
VpnUser.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00