etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud
History
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
..
acl committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
agent/api fix build 2012-09-26 17:56:29 -07:00
alert Remove @author tag from non third-party source files in api folder 2012-08-13 15:17:22 +08:00
api CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
async VPC: intermidiate checkin to Static Routes 2012-06-25 21:00:57 -07:00
capacity Remove @author tag from non third-party source files in api folder 2012-08-13 15:17:22 +08:00
cluster committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
configuration VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details: 2012-08-01 18:57:33 -07:00
consoleproxy committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dao committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dc CS-14277 2012-09-11 17:22:43 +05:30
deploy bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
domain committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
event Add Nicira configuration to the UI 2012-09-30 23:33:37 -07:00
exception Remove @author tag from non third-party source files in api folder 2012-08-13 15:17:22 +08:00
host Remove @author tag from non third-party source files in api folder 2012-08-13 15:17:22 +08:00
hypervisor Merge branch 'master' into vpc 2012-08-01 19:04:28 -07:00
network CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
offering VPC: added one more default network offering for VPC - the one not having LB service 2012-07-17 17:46:17 -07:00
org committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
projects CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process. 2012-10-05 15:10:31 -07:00
resource CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance 2012-10-08 14:05:05 +08:00
serializer committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
server CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
storage CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
template committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
user CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
uservm committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
vm CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00