Merge branch 'master' of https://github.com/apache/stratos into tenant-isolation-v1
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dd7442dd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dd7442dd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dd7442dd Branch: refs/heads/tenant-isolation Commit: dd7442dd4be07abbfbd7d84abb5e028ec3ee68fd Parents: 70da581 19aaca5 Author: Dinithi <[email protected]> Authored: Mon Jun 29 18:30:25 2015 +0530 Committer: Dinithi <[email protected]> Committed: Mon Jun 29 18:30:25 2015 +0530 ---------------------------------------------------------------------- .../python/cartridge.agent/cartridge.agent/plugins/README.md | 4 ++-- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 6 ++++-- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dd7442dd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ----------------------------------------------------------------------
