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/19fc9f8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/19fc9f8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/19fc9f8b Branch: refs/heads/master Commit: 19fc9f8b301f7d0d9f69efe770022ef9257c6060 Parents: 3b1570f 524e6a2 Author: Imesh Gunaratne <[email protected]> Authored: Mon Dec 9 17:14:47 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Dec 9 17:14:47 2013 +0530 ---------------------------------------------------------------------- .../rule/AutoscalerRuleEvaluator.java | 36 +++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
