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 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
..
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 CS-16412: fixed count for following commands: 2012-10-15 18:16: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 CS-16412: fixed count for following commands: 2012-10-15 18:16: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 CS-16412: fixed count for following commands: 2012-10-15 18:16:59 -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 CS-16412: fixed count for following commands: 2012-10-15 18:16: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