[17.09] Don't filter nodes if logdriver==none or logdriver==""#2442
Merged
nishanttotla merged 3 commits intoNov 18, 2017
Merged
Conversation
The "none" driver is a special keyword to disable logging, so don't filter nodes if the "none" driver is not listed on the nodes, since it's not really a driver and doesn't exist. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 9608c63) Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com> (cherry picked from commit 05c8675) Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Contributor
Author
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Codecov Report
@@ Coverage Diff @@
## bump_v17.09 #2442 +/- ##
===============================================
- Coverage 65.36% 60.21% -5.15%
===============================================
Files 80 128 +48
Lines 14477 26154 +11677
===============================================
+ Hits 9463 15749 +6286
- Misses 4241 9016 +4775
- Partials 773 1389 +616 |
anshulpundir
approved these changes
Nov 13, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This is a cherry-pick of #2396 and #2438 applied in that order.
Cherry-picks were clean (when applied in order).
I had to also update vendoring by re-running
vndrwith the latest version.