mirror of https://github.com/apache/cloudstack.git
8f2d9a09e5
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 |
||
|---|---|---|
| .. | ||
| dao | ||
| MockConfigurationManagerImpl.java | ||
| MockNetworkManagerImpl.java | ||
| MockResourceLimitManagerImpl.java | ||
| MockSite2SiteVpnManagerImpl.java | ||
| MockVpcManagerImpl.java | ||
| VpcApiUnitTest.java | ||