[release/2.6] Cherry-Pick commits for release 2.6.3#2558
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## release/2.6 #2558 +/- ##
===============================================
- Coverage 59.69% 51.54% -8.15%
===============================================
Files 127 127
Lines 14333 11380 -2953
===============================================
- Hits 8556 5866 -2690
+ Misses 4884 4761 -123
+ Partials 893 753 -140
Continue to review full report at Codecov.
|
Collaborator
|
@mrueg can you do the cherry picks with the Thanks for doing this! |
Signed-off-by: Stephen J Day <stephen.day@docker.com> (cherry picked from commit 1ba5b3b)
Signed-off-by: Wenkai Yin <yinw@vmware.com> (cherry picked from commit 005c6e0)
Remove EndpointConfig.Transport from the return value of the registry.notifications.endpoints expvar.Func. It results in an empty value for that expvar variable under Go 1.7 because it is a non-nil *http.Transport, which Go 1.7 can no longer encode as JSON. Signed-off-by: Noah Treuhaft <noah.treuhaft@docker.com> (cherry picked from commit 9a58c91)
Author
|
@stevvooe cherry-picked with -x. Thanks for letting me know! |
stevvooe
changed the title
Collaborator
|
LGTM |
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.
@stevvooe as you mentioned here [1] (sorry it took so long) Can you consider these commits for a 2.6.3 release?
[1] #2383 (comment)