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 2020/02/25 17:09:41 UTC

[airavata] 01/01: Merge branch 'master' 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 6e92079b053902d34befc1ee1d04425ad737af9f
Merge: 74bdf1c e8b7e3b
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Feb 25 12:05:19 2020 -0500

    Merge branch 'master' into develop

 .../scigap/production/host_vars/simccs/vars.yml    |  4 +-
 .../scigap/production/host_vars/v4i/vars.yml       | 50 ++++++++++++++++++++++
 .../scigap/production/host_vars/v4i/vault.yml      | 15 +++++++
 .../ansible/inventories/scigap/production/hosts    |  1 +
 dev-tools/ansible/roles/database/tasks/django.yml  |  2 +-
 .../task/submission/config/GroovyMapBuilder.java   | 15 +++----
 6 files changed, 74 insertions(+), 13 deletions(-)