Merge branch '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/5f04191c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5f04191c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5f04191c Branch: refs/heads/develop Commit: 5f04191cb7078ee8dc6ff4e848553cc79357152c Parents: 1a6606f 7b0cc0b Author: Marcus Christie <[email protected]> Authored: Wed Oct 11 16:34:46 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Wed Oct 11 16:34:46 2017 -0400 ---------------------------------------------------------------------- dev-tools/ansible/ansible.cfg | 2 +- .../production/pga_config/Kentucky/vars.yml | 65 +++++ .../production/pga_config/Kentucky/vault.yml | 18 ++ .../simvascular/files/pga_config.php.j2 | 290 +++++++++++++++++++ .../production/pga_config/simvascular/vars.yml | 3 + 5 files changed, 377 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
