Fix fluentd configs to collect etcd logs on the master #12045
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
GCE e2e build/test passed for commit 9e123aea890aaa75f7d8b25ab49649ff158d2042. |
|
GCE e2e build/test failed for commit 686949e6e79585a8d558125673d4defa290d1e01. |
|
That's awesome, gendocs caught that one of the logging docs had a tag that didn't match the new one. I've pushed a fixed commit. |
|
I just realized @satnam6502 is out today and @roberthbailey is out this afternoon. @fabioy, want to rubber stamp a quick config fix? |
|
I can do it |
| @@ -94,20 +94,13 @@ | |||
| tag docker | |||
| </source> | |||
|
|
|||
| <match kubernetes.**> | |||
There was a problem hiding this comment.
Why is this match rules being removed?
There was a problem hiding this comment.
Because it was left in by a bad merge. The real match rule is at the bottom of the file.
satnam6502
added
the
lgtm
|
GCE e2e build/test passed for commit 69ab702. |
mikedanese
added a commit
that referenced
this pull request
Jul 31, 2015
Fix fluentd configs to collect etcd logs on the master
zmerlynn
added a commit
that referenced
this pull request
Jul 31, 2015
…2045-upstream-release-1.0 Automated cherry pick of #12045 upstream release 1.0
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also remove some cruft from a previous poor merge conflict resolution.
Fixes #11997
@satnam6502 @roberthbailey