This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 6f6625f1f5cad74a90adc4b5953dcd5690a3e20d Merge: c37068a 8ec17e3 Author: Olivér Szabó <[email protected]> AuthorDate: Mon Jan 29 13:31:06 2018 +0100 Merge pull request #209 from oleewere/AMBARI-22860-trunk AMBARI-22860. Support external zookeeper for Infra Solr and Log Search (+ fix zookeeper sasl client name) .../libraries/functions/solr_cloud_util.py | 46 +++++++++++----------- .../src/main/resources/solrCloudCli.sh | 2 +- .../0.1.0/configuration/infra-solr-env.xml | 29 +++++++++++++- .../0.1.0/package/scripts/infra_solr.py | 2 +- .../AMBARI_INFRA/0.1.0/package/scripts/params.py | 27 ++++++++----- .../0.1.0/package/scripts/setup_infra_solr.py | 37 +++++++++-------- .../0.1.0/properties/infra-solr-env.sh.j2 | 1 + .../0.5.0/configuration/logsearch-common-env.xml | 20 ++++++++++ .../LOGSEARCH/0.5.0/package/scripts/params.py | 7 ++++ .../0.5.0/package/scripts/setup_logsearch.py | 3 +- .../LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2 | 4 ++ .../LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2 | 4 ++ .../test/python/stacks/2.4/configs/default.json | 1 + 13 files changed, 132 insertions(+), 51 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
