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

..

bindir

fixing utils license header

2012-06-06 23:06:02 -04:00

certs

Update fail-safe keystore with RSA private key

2011-07-25 18:55:16 -07:00

conf

if db.properties.override missing, shouldn't panic

2012-10-10 16:20:35 -07:00

src/com/cloud/utils

CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands

2012-10-12 13:58:59 -07:00

test

bug CS-16034 getRandomIp can return -1 unexpectedly

2012-08-16 11:42:25 -07:00

pom.xml

Merge some stuff from maven-waf branch into master

2012-10-01 15:04:08 -07:00