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/86f4e725 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/86f4e725 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/86f4e725 Branch: refs/heads/master Commit: 86f4e725b611f7d8799662fd388e3dd3486a7445 Parents: 78e043e 708dbf5 Author: Isuru <[email protected]> Authored: Tue Dec 17 14:46:34 2013 +0530 Committer: Isuru <[email protected]> Committed: Tue Dec 17 14:46:34 2013 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/Constants.java | 15 +++++++++--- .../health/HealthEventMessageDelegator.java | 25 +++++++++++++++----- 2 files changed, 31 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
