cloudstack-mirror/server/src/com/cloud/user
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
..
dao CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI. 2012-08-28 13:52:42 -07:00
AccountDetailsDao.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
AccountDetailsDaoImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
AccountDetailVO.java Removed all javax source code from utils package 2012-08-08 12:58:22 -07:00
AccountManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
AccountManagerImpl.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
DomainManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
DomainManagerImpl.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00