Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0626aefe Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0626aefe Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0626aefe Branch: refs/heads/4.0.0-grouping Commit: 0626aefea65184759a424ab2e88cecd5ab92356b Parents: b3ac273 07eeac3 Author: Isuru Haththotuwa <[email protected]> Authored: Thu Oct 2 17:46:11 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Oct 2 17:46:11 2014 +0530 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 5 ++ .../metadata/client/rest/DefaultRestClient.java | 6 ++ .../registry/DataRegistryFactory.java | 4 +- .../metadataservice/services/MetaDataAdmin.java | 2 +- .../stratos/metadataservice/util/ConfUtil.java | 7 +- .../rest/endpoint/services/ServiceUtils.java | 74 ++++++++++++++++++-- 6 files changed, 85 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
