Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/39207f67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/39207f67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/39207f67 Branch: refs/heads/master Commit: 39207f67ce581cb64450f9f5939761d510794d50 Parents: 465f3bc fee25c8 Author: Pradeep Fernando <[email protected]> Authored: Wed Jan 15 18:59:26 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Wed Jan 15 18:59:26 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 15 +++ .../health/AutoscalerHealthStatReceiver.java | 12 +- .../topology/AutoscalerTopologyReceiver.java | 14 ++- .../stratos/autoscaler/util/AutoscalerUtil.java | 22 +++- .../LoadBalancerStatisticsReader.java | 6 +- .../LoadBalancerStatisticsNotifier.java | 2 +- .../TenantAwareLoadBalanceEndpoint.java | 2 +- .../balancer/mediators/ResponseInterceptor.java | 2 +- .../LoadBalancerStatisticsCollector.java | 114 +++++++++++++------ .../stat/HealthStatEventMessageQueue.java | 2 +- .../InstanceNotifierEventMessageQueue.java | 2 +- .../tenant/TenantEventMessageQueue.java | 2 +- .../topology/TopologyEventMessageQueue.java | 2 +- .../stratos/messaging/util/Constants.java | 1 + .../rest/endpoint/services/ServiceUtils.java | 11 ++ .../extension/HAProxyStatisticsReader.java | 2 +- .../distribution/src/main/bin/stratos.sh | 1 + 17 files changed, 156 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
