You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/10 21:12:46 UTC
[6/8] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c00e48f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c00e48f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c00e48f9
Branch: refs/heads/master
Commit: c00e48f9fb83b8156ad91885aad493af48db3cf3
Parents: cbc482a f573c20
Author: Isuru <is...@wso2.com>
Authored: Tue Dec 10 20:48:15 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Tue Dec 10 20:48:15 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 36 ++-
.../mgt/subscription/CartridgeSubscription.java | 3 +-
.../apache/stratos/autoscaler/Constants.java | 3 +
.../autoscaler/NetworkPartitionContext.java | 171 +++++++++++++++
.../autoscaler/api/AutoScalerServiceImpl.java | 54 ++++-
.../exception/NonExistingLBException.java | 43 ++++
.../interfaces/AutoScalerServiceInterface.java | 5 +-
.../autoscaler/partition/PartitionManager.java | 65 +++++-
.../cloud/controller/pojo/Cartridge.java | 20 ++
.../cloud/controller/pojo/CartridgeConfig.java | 20 ++
.../cloud/controller/pojo/CartridgeInfo.java | 10 +
.../controller/pojo/LoadbalancerConfig.java | 70 ++++++
.../topology/TopologyEventSender.java | 6 +-
.../controller/util/CloudControllerUtil.java | 8 +
.../WSO2CEPInFlightRequestPublisher.java | 13 +-
.../extension/api/LoadBalancerStatsReader.java | 3 +-
.../TenantAwareLoadBalanceEndpoint.java | 31 ++-
.../balancer/mediators/ResponseInterceptor.java | 26 ++-
...adBalancerInFlightRequestCountCollector.java | 71 +++---
.../WSO2CEPInFlightRequestCountObserver.java | 36 +--
.../stratos/load/balancer/util/Constants.java | 3 +
.../event/topology/ClusterCreatedEvent.java | 2 +-
.../apache/stratos/rest/endpoint/Constants.java | 6 +-
.../definition/CartridgeDefinitionBean.java | 3 +
.../cartridge/definition/LoadBalancerBean.java | 4 +
.../bean/util/converter/PojoConverter.java | 12 +-
.../rest/endpoint/services/ServiceUtils.java | 218 ++++++++++++++++++-
.../rest/endpoint/services/StratosAdmin.java | 16 +-
.../LoadBalancerStatisticsEventBuilder.xml | 4 +-
.../AverageRequestsInflightFinder.xml | 4 +-
.../GradientOfRequestsInFlightFinder.xml | 6 +-
...SecondDerivativeOfRequestsInFlightFinder.xml | 6 +-
.../stream-manager-config.xml | 9 +-
.../haproxy/extension/HAProxyStatsReader.java | 34 +--
.../src/main/resources/AutoScalerService.wsdl | 122 ++++++++++-
.../main/resources/CloudControllerService.wsdl | 21 +-
36 files changed, 1027 insertions(+), 137 deletions(-)
----------------------------------------------------------------------