cloudstack

Commit Graph

Author	SHA1	Message	Date
Marcus Sorensen	c4c9d2d879	Summary: Fixes for api_refactoring Detail: api_refactoring branch was recently merged into master. This pulls in those changes and fixes conflicts. Tested to ensure functionality was intact. Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357778902 -0700	2013-01-09 17:48:22 -07:00
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
Alena Prokharchyk	436960d2aa	Fixed unittest	2012-10-05 15:38:20 -07:00
Alena Prokharchyk	62526a715a	Fixed unitest	2012-08-13 16:20:09 -07:00
Mice Xia	bd2a130251	fix unittest SecurityGroupManagerImpl2Test	2012-08-10 16:01:43 +08:00

5 Commits