You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ambari.apache.org by ol...@apache.org on 2018/07/08 17:38:10 UTC

[ambari] 01/01: Merge pull request #1708 from oleewere/AMBARI-24261-trunk

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 90e3471227fb660122333070c78237657746abd6
Merge: 61cde32 7d80d34
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Sun Jul 8 19:38:06 2018 +0200

    Merge pull request #1708 from oleewere/AMBARI-24261-trunk
    
    [Ambari 24261] Logfeeder fail to start due to missing conf file post logsearch upgrade

 .../src/main/package/deb/logfeeder/postinst        | 11 ++--
 .../src/main/package/rpm/logfeeder/postinstall.sh  | 11 ++--
 .../logfeeder-kafka-output-config.xml              | 61 ++++++++++++++++++++++
 .../0.5.0/configuration/logfeeder-properties.xml   |  2 +-
 .../LOGSEARCH/0.5.0/package/scripts/params.py      | 13 ++++-
 .../0.5.0/package/scripts/setup_logfeeder.py       |  5 ++
 .../0.5.0/properties/kafka-output.json.j2          | 34 ++++++++++++
 7 files changed, 128 insertions(+), 9 deletions(-)