Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/59ca27bc Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/59ca27bc Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/59ca27bc Branch: refs/heads/develop Commit: 59ca27bca0ae84dfebd072ec8abc02a5de210b71 Parents: aa15344 c26f289 Author: Gourav Shenoy <[email protected]> Authored: Tue Jun 6 14:35:37 2017 -0400 Committer: Gourav Shenoy <[email protected]> Committed: Tue Jun 6 14:35:37 2017 -0400 ---------------------------------------------------------------------- .../core/impl/TenantManagementKeycloakImpl.java | 4 +++- .../airavata/KeycloakIdentityServerClient.java | 18 +++++++++++------- .../org/apache/airavata/MigrationManager.java | 1 - 3 files changed, 14 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
