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/68485540 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/68485540 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/68485540 Branch: refs/heads/master Commit: 684855407e7ab6b23cad94aa1b33c2d40256754f Parents: 0d04cb4 d69833e Author: Pradeep Fernando <[email protected]> Authored: Wed Jan 8 13:00:20 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Wed Jan 8 13:00:20 2014 +0530 ---------------------------------------------------------------------- .../rule/AutoscalerRuleEvaluator.java | 52 ++++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
