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/vm
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
..
BareMetalVmService.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
DiskProfile.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
InstanceGroup.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
Nic.java Plug nic support 2012-06-15 14:07:46 -07:00
NicProfile.java VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones 2012-07-23 16:38:14 -07:00
ReservationContext.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
RunningOn.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
UserVmService.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
VirtualMachine.java 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support 2012-06-15 14:04:09 -07:00
VirtualMachineProfile.java Replace db-id by UUID for user VM's vm-id. 2012-09-10 18:01:08 -07:00
VmStats.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00