cloudstack/server/src/com/cloud/storage
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
..
allocator CS-14277 2012-09-11 17:22:43 +05:30
dao Removed more unused imports in Snapshots code 2012-10-09 17:07:03 -07:00
download Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
listener CLOUDSTACK-251 : 2012-10-04 11:31:53 -07:00
monitor Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
resource Patch from Chip Childers 2012-07-02 09:51:21 -04:00
secondary Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor 2012-08-24 15:57:18 +02:00
snapshot CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
swift Patch from Chip Childers 2012-07-02 09:51:21 -04:00
upload CS-13594: Download template is unable to handle multiple SSVMs per zone 2012-08-29 15:25:00 +05:30
LocalStoragePoolListener.java CS-14277 2012-09-11 17:22:43 +05:30
OCFS2Manager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
OCFS2ManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
StorageManager.java add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
StorageManagerImpl.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
StorageMigrationCleanupMaid.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00