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/06/26 20:38:55 UTC
[3/3] airavata git commit: Merge branch 'AIRAVATA-2376'
Merge branch 'AIRAVATA-2376'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e9b42768
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e9b42768
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e9b42768
Branch: refs/heads/master
Commit: e9b42768b1b64138ba5883772f1d6dd37303a11b
Parents: 883c3f4 047521f
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Jun 26 16:38:37 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Jun 26 16:38:37 2017 -0400
----------------------------------------------------------------------
.../ansible/roles/api-orch/defaults/main.yml | 1 +
.../files/mysql-connector-java-5.1.37-bin.jar | Bin 985603 -> 0 bytes
dev-tools/ansible/roles/api-orch/tasks/main.yml | 10 +++---
.../templates/airavata-server.properties.j2 | 34 +++++++++----------
dev-tools/ansible/roles/gfac/defaults/main.yml | 1 +
.../files/mysql-connector-java-5.1.37-bin.jar | Bin 985603 -> 0 bytes
dev-tools/ansible/roles/gfac/tasks/main.yml | 11 +++---
.../templates/airavata-server.properties.j2 | 34 +++++++++----------
.../files/mysql-connector-java-5.1.37-bin.jar | Bin 985603 -> 0 bytes
.../main/resources/airavata-server.properties | 34 +++++++++----------
.../src/main/resources/expcatalog-mysql.sql | 2 +-
.../DeltaScripts/expCatalog_schema_delta.sql | 2 +-
12 files changed, 65 insertions(+), 64 deletions(-)
----------------------------------------------------------------------