You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/21 10:58:53 UTC

[06/15] stratos git commit: Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/83ae70f8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/83ae70f8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/83ae70f8

Branch: refs/heads/master
Commit: 83ae70f869142ef70eb9503269e7ab183b97ef36
Parents: 226324e 1e7e300
Author: anuruddhal <an...@gmail.com>
Authored: Wed May 20 09:24:06 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed May 20 09:24:06 2015 +0530

----------------------------------------------------------------------
 README.md                                       | 49 ++++++------
 .../src/main/resources/META-INF/component.xml   |  2 +-
 .../stratos/cli/RestCommandLineService.java     | 13 +---
 .../src/main/resources/META-INF/component.xml   | 36 ++++-----
 .../console/controllers/menu/menu.json          | 26 +++----
 .../manager/utils/PermissionConstants.java      | 73 +++++++++++++-----
 .../stratos/manager/utils/UserRoleCreator.java  | 32 +++-----
 .../src/main/resources/META-INF/component.xml   | 50 ++++++------
 .../rest/endpoint/api/StratosApiV41.java        | 80 ++++++++++----------
 .../rest/endpoint/api/StratosApiV41Utils.java   | 14 +++-
 10 files changed, 200 insertions(+), 175 deletions(-)
----------------------------------------------------------------------