merging the remote branch
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/f55323c4 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f55323c4 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f55323c4 Branch: refs/heads/develop Commit: f55323c47dfc4f2838a54e9114e5a802d051fc0a Parents: 1c6c44d dd00dd4 Author: scnakandala <[email protected]> Authored: Fri Mar 24 10:20:12 2017 -0400 Committer: scnakandala <[email protected]> Committed: Fri Mar 24 10:20:12 2017 -0400 ---------------------------------------------------------------------- app/controllers/AccountController.php | 9 +++-- app/controllers/AdminController.php | 7 ++-- app/libraries/Keycloak/API/RoleMapper.php | 54 +++++++++++++++++++++----- app/libraries/Keycloak/API/Users.php | 30 +++++++++++++- app/libraries/Keycloak/Keycloak.php | 25 +++++++++++- app/libraries/SharingUtilities.php | 2 +- 6 files changed, 107 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
