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

Posted to commits@airavata.apache.org by sm...@apache.org on 2018/01/19 16:30:26 UTC

[airavata] 02/02: Merge branch 'master' into AIRAVATA-2620

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

smarru pushed a commit to branch AIRAVATA-2620
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit e3de5a05731c27b6eb640a7da4b97b177aad48fc
Merge: eacf68f 4a3ba81
Author: Suresh Marru <sm...@apache.org>
AuthorDate: Fri Jan 19 11:26:03 2018 -0500

    Merge branch 'master' into AIRAVATA-2620

 .../scigap/SGCI-SSC/group_vars/pga/vars.yml        | 26 +++++++-------
 .../ansible/inventories/scigap/SGCI-SSC/hosts      | 21 ++++++++++++
 .../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 +
 .../production/pga_config/simvascular/vars.yml     |  1 +
 .../pga_config/southernillinois/vars.yml           |  1 +
 .../roles/gfac/templates/gfac-config.yaml.j2       |  2 ++
 .../airavata/gfac/core/context/ProcessContext.java | 40 +++++++++++++++++++++-
 .../org/apache/airavata/gfac/impl/Factory.java     | 17 ++++-----
 .../apache/airavata/gfac/impl/GFacEngineImpl.java  |  2 +-
 12 files changed, 91 insertions(+), 23 deletions(-)

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