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/148aa4ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/148aa4ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/148aa4ef Branch: refs/heads/master Commit: 148aa4ef261cdf7f9892e83b90323d9155894fc3 Parents: 32a4abb 47a5f65 Author: Manula Thantriwatte <[email protected]> Authored: Wed Dec 18 15:39:46 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 18 15:39:46 2013 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/AutoscalerContext.java | 4 ++++ .../receiver/health/HealthEventMessageDelegator.java | 15 +++++++++------ .../stratos/autoscaler/monitor/AbstractMonitor.java | 1 - .../stratos/autoscaler/TestObsoletedMemberRule.java | 7 +------ 4 files changed, 14 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
