Merge remote-tracking branch 'origin/master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a445590b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a445590b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a445590b Branch: refs/heads/develop Commit: a445590b880ddd3c0671d959f28131406b37e205 Parents: f0f6b34 883c3f4 Author: Marcus Christie <[email protected]> Authored: Fri Jun 23 17:41:50 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Fri Jun 23 17:42:16 2017 -0400 ---------------------------------------------------------------------- .../scigap/production/pga_config/nanoconfinement/vars.yml | 8 ++++---- dev-tools/ansible/roles/pga/tasks/main.yml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a445590b/dev-tools/ansible/roles/pga/tasks/main.yml ----------------------------------------------------------------------
