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/417e18f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/417e18f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/417e18f4 Branch: refs/heads/master Commit: 417e18f4247e9209507fa16cb9d9b6f0cb2604d3 Parents: 83b8880 09f9165 Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 26 03:05:56 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 26 03:05:56 2013 +0530 ---------------------------------------------------------------------- products/autoscaler/modules/distribution/src/main/conf/scaling.drl | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
