etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/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
..
dao CLOUDSTACK-70: Improve restart network behaviour for basic network 2012-10-11 19:33:26 +05:30
ClusteredVirtualMachineManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ItWorkDao.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ItWorkDaoImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ItWorkVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NicVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ReservationContextImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
SystemVmLoadScanHandler.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
SystemVmLoadScanner.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
UserVmManager.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
UserVmManagerImpl.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
UserVmStateListener.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
VirtualMachineGuru.java add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
VirtualMachineManager.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
VirtualMachineManagerImpl.java CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance 2012-10-08 14:05:05 +08:00
VirtualMachineProfileImpl.java Replace db-id by UUID for user VM's vm-id. 2012-09-10 18:01:08 -07:00