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/69ccd880 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/69ccd880 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/69ccd880 Branch: refs/heads/master Commit: 69ccd88039a5484185cbbaa47cef6257b03e011d Parents: 8e417ad b48bfcd Author: Sajith Kariyawasam <[email protected]> Authored: Fri Jan 17 12:46:43 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Fri Jan 17 12:46:43 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 19 ++++ .../console/themes/theme1/partials/header.hbs | 12 ++- .../console/themes/theme1/renderers/index.js | 6 +- .../console/themes/theme1/theme.js | 43 +++++++-- .../distribution/src/main/conf/scaling.drl | 95 +++++++++++--------- 5 files changed, 117 insertions(+), 58 deletions(-) ----------------------------------------------------------------------
