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 |
|
