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/1df2f539 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1df2f539 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1df2f539 Branch: refs/heads/master Commit: 1df2f539b88587d6ff6dd0d6aeccd210e2f87ee3 Parents: 99da123 e589c5c Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 25 14:16:54 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 25 14:16:54 2013 +0530 ---------------------------------------------------------------------- .../message/receiver/topology/AutoscalerTopologyReceiver.java | 1 - .../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 3 +-- .../org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 1 + .../autoscaler/modules/distribution/src/main/conf/scaling.drl | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
