Merge branch 'stratos-4.1.x' of https://github.com/Thanu/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/509bd6bd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/509bd6bd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/509bd6bd Branch: refs/heads/stratos-4.1.x Commit: 509bd6bdc4b7e6fd7c8a0e0fc3ec3b637e68d514 Parents: 6496b05 05d1c18 Author: gayangunarathne <[email protected]> Authored: Mon Nov 23 20:08:45 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Mon Nov 23 20:08:45 2015 +0530 ---------------------------------------------------------------------- .../monitor/cluster/ClusterMonitor.java | 21 ++++- .../publisher/AutoscalerPublisherFactory.java | 5 +- .../publisher/DASScalingDecisionPublisher.java | 25 ++++-- .../publisher/ScalingDecisionPublisher.java | 24 ++++-- .../autoscaler/util/AutoscalerConstants.java | 1 + .../messaging/topology/TopologyBuilder.java | 34 ++------ .../CloudControllerPublisherFactory.java | 9 +- .../DASMemberInformationPublisher.java | 23 ++++-- .../publisher/DASMemberStatusPublisher.java | 22 +++-- .../publisher/MemberInformationPublisher.java | 12 ++- .../publisher/MemberStatusPublisher.java | 16 ++-- .../util/CloudControllerConstants.java | 2 + ...InvalidStatisticsPublisherTypeException.java | 30 +++++++ .../publisher/HealthStatisticsPublisher.java | 12 ++- .../HealthStatisticsPublisherFactory.java | 5 +- .../publisher/InFlightRequestPublisher.java | 11 ++- .../InFlightRequestPublisherFactory.java | 5 +- .../publisher/ThriftStatisticsPublisher.java | 86 ++++++++++---------- .../cep/WSO2CEPHealthStatisticsPublisher.java | 20 +++-- .../cep/WSO2CEPInFlightRequestPublisher.java | 28 +++++-- .../src/main/conf/drools/dependent-scaling.drl | 8 +- .../src/main/conf/drools/mincheck.drl | 9 +- .../src/main/conf/drools/scaling.drl | 8 +- .../src/test/resources/common/scaling.drl | 8 +- 24 files changed, 259 insertions(+), 165 deletions(-) ----------------------------------------------------------------------
