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/9a271063 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9a271063 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9a271063 Branch: refs/heads/master Commit: 9a271063a717becc184792a3e2f7d8427176655d Parents: 3d72890 e19679c Author: Pradeep Fernando <[email protected]> Authored: Mon Jan 20 09:47:47 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Mon Jan 20 09:47:47 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/algorithm/OneAfterAnother.java | 2 +- .../receiver/health/AutoscalerHealthStatReceiver.java | 4 ++-- .../stratos/autoscaler/monitor/ClusterMonitor.java | 6 ++++++ .../modules/distribution/src/main/conf/scaling.drl | 12 +++++++----- 4 files changed, 16 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
