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 2018/01/18 19:22:27 UTC
[airavata] 04/04: Merge branch 'AIRAVATA-2621-bugfix' 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 0f25c2f1dcb3f58a31cfad631d19bfbef714a349
Merge: 0d77ff5 53888e1
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Jan 18 14:21:54 2018 -0500
Merge branch 'AIRAVATA-2621-bugfix' into develop
Fixes AIRAVATA-2621 and AIRAVATA-2624
.../csbglsu => SGCI-SSC/group_vars/pga}/vars.yml | 51 +++++++++++++---------
.../ansible/inventories/scigap/SGCI-SSC/hosts | 21 +++++++++
.../scigap/dreg-production/group_vars/pga/vars.yml | 1 +
.../scigap/production/pga_config/csbglsu/vars.yml | 1 +
.../production/pga_config/iugateway/vars.yml | 1 +
.../production/pga_config/iugeosurvey/vars.yml | 1 +
.../scigap/production/pga_config/scigap/vars.yml | 1 +
.../pga_config/{csbglsu => searchingSRA}/vars.yml | 26 ++++++-----
.../production/pga_config/searchingSRA/vault.yml | 18 ++++++++
.../production/pga_config/simvascular/vars.yml | 1 +
.../production/pga_config/southdakota/vars.yml | 1 +
.../pga_config/southernillinois/vars.yml | 1 +
.../production/pga_config/testdrive/vars.yml | 1 +
dev-tools/ansible/pga-scigap-prod.yml | 1 +
.../roles/gfac/templates/gfac-config.yaml.j2 | 7 ++-
.../org/apache/airavata/gfac/core/GFacUtils.java | 2 +-
.../airavata/gfac/core/context/ProcessContext.java | 40 ++++++++++++++++-
.../org/apache/airavata/gfac/impl/Factory.java | 17 ++++----
.../apache/airavata/gfac/impl/GFacEngineImpl.java | 2 +-
19 files changed, 151 insertions(+), 43 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.