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/9cb5bcb9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9cb5bcb9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9cb5bcb9 Branch: refs/heads/master Commit: 9cb5bcb9cec4d8bc89dfad6f7ba63293183e32e8 Parents: cbfe816 148aa4e Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 18 16:13:01 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 18 16:13:01 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 4 ++++ .../health/HealthEventMessageDelegator.java | 15 +++++++++------ .../stratos/autoscaler/monitor/AbstractMonitor.java | 1 - .../stratos/autoscaler/TestObsoletedMemberRule.java | 7 +------ .../apache/stratos/cli/RestCommandLineService.java | 12 ++++++------ .../stratos/cli/commands/SubscribeCommand.java | 16 ++++++++-------- 6 files changed, 28 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
