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/357b3a52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/357b3a52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/357b3a52 Branch: refs/heads/master Commit: 357b3a52c170d633bee4a0f4e1846a940aad7eaf Parents: 246686a cd15108 Author: Manula Thantriwatte <[email protected]> Authored: Wed Dec 11 10:43:22 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 11 10:43:22 2013 +0530 ---------------------------------------------------------------------- ...oadBalancerInFlightRequestCountNotifier.java | 25 +- .../messaging/domain/topology/Cluster.java | 21 + tools/stratos-installer/conf/setup.conf | 80 +- .../stratos-installer/config/sc/bin/stratos.sh | 301 -------- .../config/sc/repository/conf/axis2/axis2.xml | 724 ------------------- .../repository/conf/cartridge-config.properties | 23 +- .../sc/repository/conf/etc/logging-config.xml | 40 - .../config/sc/repository/conf/log4j.properties | 171 ----- tools/stratos-installer/setup.sh | 231 ++---- tools/stratos-installer/start-servers.sh | 2 +- 10 files changed, 152 insertions(+), 1466 deletions(-) ----------------------------------------------------------------------
