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/064f7e8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/064f7e8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/064f7e8b Branch: refs/heads/master Commit: 064f7e8b51be82dea53f171aeb615326ad65e416 Parents: 3b413f5 9c2b9c2 Author: Nirmal Fernando <[email protected]> Authored: Fri Mar 28 22:18:02 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Fri Mar 28 22:18:02 2014 +0530 ---------------------------------------------------------------------- .../repository/conf/activemq/jndi.properties | 28 ++++ .../config/all/repository/conf/autoscaler.xml | 39 ++++++ .../repository/conf/cartridge-config.properties | 28 ++++ .../all/repository/conf/cloud-controller.xml | 89 +++++++++++++ .../conf/datasources/master-datasources.xml | 129 +++++++++++++++++++ .../conf/datasources/stratos-datasources.xml | 51 ++++++++ .../config/all/repository/conf/jndi.properties | 32 +++++ 7 files changed, 396 insertions(+) ----------------------------------------------------------------------
