Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8322522a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8322522a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8322522a Branch: refs/heads/master Commit: 8322522a5c8fc275ddb2c53ac4b54cd014136966 Parents: f1bddab 97569d5 Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 13 13:52:18 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 13 13:52:18 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/ClusterMonitor.java | 23 ++++++----- .../autoscaler/NetworkPartitionContext.java | 41 ++++++++++++++++++++ .../stratos/autoscaler/PartitionContext.java | 4 +- .../health/HealthEventMessageDelegator.java | 38 ++++++++++++++++-- 4 files changed, 92 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
