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/4506c597 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4506c597 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4506c597 Branch: refs/heads/master Commit: 4506c59708d02a0e0b2768c6b8569d712da24bfe Parents: 8344f0a 9b9c081 Author: rekathiru <[email protected]> Authored: Fri Jan 10 17:41:35 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Jan 10 17:41:35 2014 +0530 ---------------------------------------------------------------------- .../health/AutoscalerHealthStatReceiver.java | 25 ++++++---- .../distribution/src/main/conf/scaling.drl | 52 ++++++++++---------- 2 files changed, 41 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
