cloudstack/api/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
..
Account.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
AccountService.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
DomainService.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
OwnedBy.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
ResourceLimitService.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
SSHKeyPair.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
User.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
UserAccount.java CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException " 2012-10-05 11:42:04 -07:00
UserContext.java Reverted "Initialize user context from AccountManager" committed to master branch by mistake 2012-08-08 15:26:45 -07:00