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/f40a5e1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f40a5e1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f40a5e1c Branch: refs/heads/master Commit: f40a5e1c937e890fcfead60cc7d3da6d18a18704 Parents: f3a00e7 c00cea3 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Jan 2 12:47:16 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Jan 2 12:47:16 2014 +0530 ---------------------------------------------------------------------- .../config/console.js | 8 ++ .../controllers/acs.jag | 23 +++-- .../controllers/login.jag | 10 +-- .../data/mycartridges.json | 88 +++++++------------- 4 files changed, 56 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
