You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by ma...@apache.org on 2017/12/13 20:24:06 UTC

[airavata] 03/03: Merge branch 'AIRAVATA-2571-email-verified' into develop

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 41d371bd7b4ee949b8d62db8791c2beab5e49ede
Merge: edf1783 7a9164f
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Dec 13 15:17:06 2017 -0500

    Merge branch 'AIRAVATA-2571-email-verified' into develop

 .../core/impl/TenantManagementKeycloakImpl.java    |  9 +++-
 .../production/pga_config/newUltrascan/vars.yml    | 51 ++++++++++++----------
 .../production/pga_config/newUltrascan/vault.yml   | 34 +++++++--------
 .../production/pga_config/ultrascan/vars.yml       | 34 ++++++---------
 .../production/pga_config/ultrascan/vault.yml      | 34 +++++++--------
 .../roles/gfac/templates/gfac-config.yaml.j2       |  4 ++
 .../airavata/gfac/impl/task/SCPDataStageTask.java  |  5 +--
 7 files changed, 91 insertions(+), 80 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.