[airavata] 01/01: Merge branch 'AIRAVATA-3186-slf4j-log-abandoned'

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 77cb3dd27bef5fc23ac9fa012436d2f0eccc15e1
Merge: bc8ef64 c51a5b5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 10 15:04:34 2020 -0500

    Merge branch 'AIRAVATA-3186-slf4j-log-abandoned'

 .../scigap/develop/group_vars/all/vars.yml         |  1 +
 .../scigap/production/group_vars/all/vars.yml      |  3 +-
 .../scigap/staging/group_vars/all/vars.yml         |  1 +
 dev-tools/ansible/roles/api-orch/defaults/main.yml |  1 +
 .../templates/airavata-server.properties.j2        |  1 +
 .../ansible/roles/helix_setup/defaults/main.yml    |  1 +
 .../parser-wm/airavata-server.properties.j2        |  1 +
 .../participant/airavata-server.properties.j2      |  1 +
 .../post-wm/airavata-server.properties.j2          |  1 +
 .../templates/pre-wm/airavata-server.properties.j2 |  1 +
 .../ansible/roles/job_monitor/defaults/main.yml    |  1 +
 .../email-monitor/airavata-server.properties.j2    |  1 +
 .../airavata/common/utils/ApplicationSettings.java |  5 +++
 .../airavata/common/utils/ThriftClientPool.java    |  8 +++-
 .../common/utils/ThriftClientPoolTest.java         | 52 ++++++++++++++++++++++
 .../src/main/resources/airavata-server.properties  |  1 +
 16 files changed, 77 insertions(+), 3 deletions(-)