Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bc0f2f39 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bc0f2f39 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bc0f2f39 Branch: refs/heads/master Commit: bc0f2f39db00063f0080b246ecf1990774f1e3bd Parents: bd9ce98 24c84ad Author: Udara Liyanage <[email protected]> Authored: Wed Sep 10 17:48:44 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Sep 10 17:48:44 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/manager/dto/Cartridge.java | 11 +++++++++++ .../stratos/rest/endpoint/services/ServiceUtils.java | 1 + 2 files changed, 12 insertions(+) ----------------------------------------------------------------------
