Kelven Yang
|
453b31f3f4
|
Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring
|
2012-11-07 15:03:23 -08:00 |
|
Kelven Yang
|
cea8f3bf37
|
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
|
2012-11-07 15:03:22 -08: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
|
51cc301fef
|
CS-16222: send password reset command only to the element responsible for the userdata service in network
Reviewed-by: Sheng Yang
|
2012-09-04 13:41:10 -07:00 |
|
Gavin Lee
|
d3921139ed
|
Patch from Gavin Lee: Change license to ASL2.0 in server and tools
Signed-off-by: Chip Childers <chip.childers@gmail.com>
|
2012-08-30 10:36:29 -04:00 |
|
Alena Prokharchyk
|
93ac01db0b
|
Fixed unittest
|
2012-08-27 09:46:56 -07:00 |
|
Alena Prokharchyk
|
fe3786341f
|
Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test
|
2012-08-14 13:47:04 -07:00 |
|
Alena Prokharchyk
|
71ead9ef4e
|
VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
|
2012-08-13 14:03:39 -07:00 |
|
Alena Prokharchyk
|
bda1e2d08d
|
VPC: more unittests for VpcService
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
|
2012-08-07 11:37:36 -07:00 |
|
Alena Prokharchyk
|
cf64fda5d5
|
VPC: unittest preparation
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
|
2012-08-07 11:23:52 -07:00 |
|