Merge branch 'AIRAVATA-2507' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a7573b2f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a7573b2f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a7573b2f Branch: refs/heads/develop Commit: a7573b2fb2a323ef2608d5c9c5f7c9e7d87fdac0 Parents: 84e8eef b279904 Author: Marcus Christie <[email protected]> Authored: Tue Aug 8 14:25:05 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Tue Aug 8 14:25:05 2017 -0400 ---------------------------------------------------------------------- .../admin/services/core/impl/TenantManagementKeycloakImpl.java | 3 +++ dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2 | 2 ++ 2 files changed, 5 insertions(+) ----------------------------------------------------------------------
