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/e7230417 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e7230417 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e7230417 Branch: refs/heads/master Commit: e72304172a1faa406f7cdcaad208e394020bee66 Parents: ce049c9 47f406d Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Thu Jan 16 14:45:32 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Thu Jan 16 14:45:32 2014 +0530 ---------------------------------------------------------------------- .../console/config/acl.json | 10 +++++-- .../console/controllers/router.jag | 4 +++ .../console/util/acl.jag | 31 ++++++++++++++++++-- 3 files changed, 41 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
