Skip to content

Automated cherry-pick of #820 on release-3.7#830

Merged
openshift-merge-robot merged 1 commit intoopenshift:release-3.7from
openshift-cherrypick-robot:cherry-pick-820-to-release-3.7
Dec 8, 2017
Merged

Automated cherry-pick of #820 on release-3.7#830
openshift-merge-robot merged 1 commit intoopenshift:release-3.7from
openshift-cherrypick-robot:cherry-pick-820-to-release-3.7

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #820

/assign richm

…g_key

fluent-plugin-remote-syslog: replacing tag_key with @tag_key
                             adding rescue around record[@tag_key]
Note: out_syslog.rb and out_syslog_buffered.rb are copied from
      https://github.com/docebo/fluent-plugin-remote-syslog and
      locally modified.  Once the changes made on the files are
      accepted by the plugin, out_syslog.rb and out_syslog_buffered.rb
      are to be removed and the changes on Dockerfile* are to be undone.

Adding test cases for tag_key to remote_syslog.sh
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 8, 2017
@nhosoi
Copy link
Contributor

nhosoi commented Dec 8, 2017

/lgtm

@nhosoi nhosoi added the lgtm Indicates that a PR is ready to be merged. label Dec 8, 2017
@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 56c2e57 into openshift:release-3.7 Dec 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants