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/3df20462 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3df20462 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3df20462 Branch: refs/heads/master Commit: 3df204620e5b5ca739d4bd80ae76029c640627d2 Parents: 9a38e27 39207f6 Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Jan 15 20:35:10 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Jan 15 20:35:10 2014 +0530 ---------------------------------------------------------------------- .../console/config/console.json | 12 +++ .../console/controllers/router.jag | 91 ++++++++++++++++++++ .../console/jaggery.conf | 13 ++- .../modules/security/security.manager.js | 73 ++++++++++++++++ .../modules/security/security.provider.js | 51 +++++++++++ .../modules/console/module.xml | 8 ++ .../modules/console/scripts/server.js | 20 +++++ .../modules/distribution/src/assembly/bin.xml | 4 + 8 files changed, 271 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
