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/02/09 20:59:35 UTC

[airavata] 03/03: Merge branch 'AIRAVATA-2672' 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 e67ed305058f39fec16080dbd6dfeb89defda6dc
Merge: e271719 9991e44
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Feb 9 15:59:16 2018 -0500

    Merge branch 'AIRAVATA-2672' into develop

 .../ansible/roles/gfac/templates/gfac-config.yaml.j2 |  4 ++++
 dev-tools/ansible/roles/zookeeper/tasks/main.yml     |  6 ++++++
 .../ansible/roles/zookeeper/templates/java.env.j2    |  1 +
 .../roles/zookeeper/templates/zookeeper.service.j2   |  1 +
 .../airavata/gfac/core/context/ProcessContext.java   | 20 +++++++++++++-------
 5 files changed, 25 insertions(+), 7 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.