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/eacb65fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/eacb65fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/eacb65fb Branch: refs/heads/master Commit: eacb65fbf7d7a53a3a1d0ba06a704114da82a10a Parents: da70c04 7ac9d57 Author: Imesh Gunaratne <[email protected]> Authored: Tue Nov 26 20:53:43 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Nov 26 20:53:43 2013 +0530 ---------------------------------------------------------------------- .../rule/AutoscalerRuleEvaluator.java | 3 +- .../src/main/resources/autoscaler.drl | 114 ------------------- .../distribution/src/main/conf/autoscaler.drl | 32 +++--- 3 files changed, 19 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
