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/fa37baaa Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fa37baaa Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fa37baaa Branch: refs/heads/master Commit: fa37baaa8304bd53ba030189d77bd96a8216023b Parents: a5d4801 ddf63cb Author: Imesh Gunaratne <[email protected]> Authored: Sat Dec 28 01:44:24 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sat Dec 28 01:44:24 2013 +0530 ---------------------------------------------------------------------- .../health/HealthEventMessageDelegator.java | 65 +++++++++++++++++--- .../autoscaler/policy/model/LoadAverage.java | 10 +-- .../policy/model/MemoryConsumption.java | 10 +-- .../autoscaler/rule/RuleTasksDelegator.java | 8 +++ 4 files changed, 73 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
