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/361d5c74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/361d5c74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/361d5c74 Branch: refs/heads/master Commit: 361d5c74a6780a1fd72511437d52efe91243533f Parents: d1b7170 2e6084c Author: Nirmal Fernando <[email protected]> Authored: Tue Jan 14 11:32:45 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Jan 14 11:32:45 2014 +0530 ---------------------------------------------------------------------- .../console/config/acl.json | 4 ++ .../console/controllers/acs.jag | 4 ++ .../console/util/acl.jag | 53 ++++++++++++++++++++ 3 files changed, 61 insertions(+) ----------------------------------------------------------------------
