You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2017/10/12 15:49:53 UTC
[3/3] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/857b99b6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/857b99b6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/857b99b6
Branch: refs/heads/master
Commit: 857b99b6ca57b7a00d69dcb4da9fdd81b4f7b4bf
Parents: 4a2b956 970dc68
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Thu Oct 12 11:49:11 2017 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Thu Oct 12 11:49:11 2017 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 2 +-
.../core/impl/TenantManagementKeycloakImpl.java | 14 +-
.../interfaces/TenantManagementInterface.java | 3 +-
.../services/core/tests/SetupNewGateway.java | 2 +-
.../handlers/IamAdminServicesHandler.java | 13 +-
.../handlers/TenantProfileServiceHandler.java | 50 ++++
dev-tools/ansible/ansible.cfg | 2 +-
.../simvascular/files/pga_config.php.j2 | 290 +++++++++++++++++++
.../production/pga_config/simvascular/vars.yml | 3 +
.../templates/airavata-server.properties.j2 | 1 -
.../common/utils/ApplicationSettings.java | 4 -
.../airavata/common/utils/ServerSettings.java | 1 -
.../main/resources/airavata-server.properties | 1 -
.../service/handler/RegistryServerHandler.java | 15 +
14 files changed, 379 insertions(+), 22 deletions(-)
----------------------------------------------------------------------