Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7eff3e8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7eff3e8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7eff3e8d Branch: refs/heads/master Commit: 7eff3e8d694bdc13048f3670e9319eb1ac487fbc Parents: b1ae4e2 ac00374 Author: Imesh Gunaratne <[email protected]> Authored: Thu Feb 27 02:01:43 2014 -0500 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Feb 27 02:01:43 2014 -0500 ---------------------------------------------------------------------- .../theme1/partials/subscribe_cartridge.hbs | 95 +++++++++-------- .../stratos/rest/endpoint/mock/MockContext.java | 102 +++++++++++++++---- .../rest/endpoint/mock/StratosTestAdmin.java | 23 +++-- 3 files changed, 151 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
