etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test/com/cloud/vpc
History
Alena Prokharchyk 3f5733cea7 CS-16412: fixed count for following commands: 
listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes

Conflicts:

	api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
	api/src/com/cloud/api/commands/ListConditionsCmd.java
	api/src/com/cloud/api/commands/ListCountersCmd.java
	api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
	api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
	api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
	api/src/com/cloud/network/as/AutoScaleService.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/as/dao/CounterDao.java
	server/src/com/cloud/network/as/dao/CounterDaoImpl.java
	server/src/com/cloud/projects/ProjectManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 		2012-10-15 18:16:59 -07:00
..
dao Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockConfigurationManagerImpl.java Fixed unittest 2012-09-11 17:26:20 -07:00
MockNetworkManagerImpl.java CS-16412: fixed count for following commands: 2012-10-15 18:16:59 -07:00
MockResourceLimitManagerImpl.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockSite2SiteVpnManagerImpl.java CS-16412: fixed count for following commands: 2012-10-15 18:16:59 -07:00
MockVpcManagerImpl.java CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 2012-10-12 13:58:59 -07:00
VpcApiUnitTest.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00