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/10/25 19:54:35 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 96840a737d382ee9c148cced9b779ea3c9433967
Merge: 23a1bf7 44553b9
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Oct 25 15:54:24 2017 -0400

    Merge branch 'master' into develop

 .../ansible/inventories/scigap/develop/group_vars/all/vars.yml      | 2 +-
 .../ansible/inventories/scigap/production/group_vars/all/vars.yml   | 2 +-
 .../inventories/scigap/production/pga_config/ultrascan/vars.yml     | 2 +-
 dev-tools/ansible/inventories/template/group_vars/all/vars.yml      | 2 +-
 dev-tools/ansible/roles/common/tasks/main.yml                       | 2 +-
 pom.xml                                                             | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)


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