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/908504df Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/908504df Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/908504df Branch: refs/heads/master Commit: 908504dfb94aba0f6f6bcf8aa08c3edd4f6349f2 Parents: c8985d5 58b06ce Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 20 09:33:34 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 20 09:33:34 2013 +0530 ---------------------------------------------------------------------- .../health/HealthEventMessageDelegator.java | 31 ++++++++++++++++---- .../autoscaler/monitor/AbstractMonitor.java | 12 -------- products/cartridge-agent/pom.xml | 4 --- 3 files changed, 26 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
