[18.03 backport] Avoid predefined error log, and Test if error is nil before to log it#2722
Closed
thaJeztah wants to merge 2 commits into
Closed
Conversation
Member
Author
|
ping @fcrisciani PTAL t.b.h., I only wanted to cherry-pick the second (which is a fix), but looked like the fix was introduced in |
Codecov Report
@@ Coverage Diff @@
## bump_v18.03 #2722 +/- ##
==============================================
Coverage ? 61.58%
==============================================
Files ? 134
Lines ? 21826
Branches ? 0
==============================================
Hits ? 13441
Misses ? 6934
Partials ? 1451 |
Collaborator
|
LGTM. |
- fix the logic that was checking for predefined networks. Before the GetNetwork was passing the network name, while instead the network ID is the key that is supposed to be used. The CreateNetwork anyway is doing the very same check and create the network if not existing. Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit f6e6e69) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: nmengin <nicolas@containo.us> (cherry picked from commit 99a0f58) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.03-backport-2719-fix-error-message-logging
branch
from
8f0aed8 to
acefa73
Compare
Member
Author
|
Argh |
thaJeztah
changed the title
Member
Author
|
closing, as 18.03 is EOL |
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.
Backport of #2561 and #2720 for the bump_v18.03 branch
cherry-pick was clean; no conflicts