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:57 UTC
[10/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/9a12c8bb
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9a12c8bb
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9a12c8bb
Branch: refs/heads/master
Commit: 9a12c8bb0c84235cf308c726c866949e00ed7ae3
Parents: 10d5257 7ee7ecf
Author: anuruddhal <an...@gmail.com>
Authored: Wed May 20 20:56:53 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed May 20 20:56:53 2015 +0530
----------------------------------------------------------------------
.../src/main/resources/META-INF/component.xml | 51 ++--
.../src/main/resources/META-INF/component.xml | 73 +++--
.../console/controllers/menu/menu.json | 156 +++++++++-
.../manager/utils/PermissionConstants.java | 82 ++---
.../stratos/manager/utils/UserRoleCreator.java | 2 +-
.../src/main/resources/META-INF/component.xml | 111 ++-----
.../rest/endpoint/api/AuthenticationApi.java | 2 -
.../rest/endpoint/api/StratosApiV41.java | 306 +++++++++----------
.../distribution/src/main/conf/autoscaler.xml | 5 +
tools/stratos-installer/conf/setup.conf | 3 +
tools/stratos-installer/mock_iaas.sh | 62 ++++
tools/stratos-installer/setup.sh | 2 +
.../templates/cloud-controller.xml | 7 +
13 files changed, 496 insertions(+), 366 deletions(-)
----------------------------------------------------------------------