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/dac753c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dac753c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dac753c2 Branch: refs/heads/master Commit: dac753c2f8a30c3181e755f6938ab46e4167f366 Parents: b23f202 bd29249 Author: Isuru <[email protected]> Authored: Wed Jan 8 18:29:00 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Jan 8 18:29:00 2014 +0530 ---------------------------------------------------------------------- .../controller/registry/RegistryManager.java | 10 ++++ .../distribution/src/main/assembly/bin.xml | 46 ++++++++++++++- .../distribution/src/main/conf/jndi.properties | 1 - .../distribution/src/main/assembly/bin.xml | 2 +- .../src/main/bin/cartridge-agent.sh | 43 -------------- .../distribution/src/main/bin/stratos.sh | 43 ++++++++++++++ .../src/main/resources/jndi.properties | 1 - .../distribution/src/main/assembly/bin.xml | 60 ++++++++++++++------ .../distribution/src/main/conf/jndi.properties | 1 - .../distribution/src/main/assembly/bin.xml | 47 ++++++++++++--- products/stratos-manager/conf/jndi.properties | 1 - .../modules/distribution/src/assembly/bin.xml | 51 +++++++++++++++-- 12 files changed, 223 insertions(+), 83 deletions(-) ----------------------------------------------------------------------
