[18.03 backport] use a custom grpc dialer when managers are joining#2828
Merged
dperny merged 1 commit intomoby:bump_v18.03from Mar 6, 2019
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## bump_v18.03 #2828 +/- ##
==============================================
Coverage ? 61.58%
==============================================
Files ? 134
Lines ? 21834
Branches ? 0
==============================================
Hits ? 13446
Misses ? 6935
Partials ? 1453 |
Member
Author
|
marking this "WIP" because there's some comments on the original PR, and we should have it merged in master first |
Contributor
|
LGTM once the original PR is merged |
Signed-off-by: Dani Louca <dani.louca@docker.com> (cherry picked from commit 85aeb0b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
4bd5bb8 to
a4e920f
Compare
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
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 #2802 for 18.03
Minor conflict in import statements, due to #2750 not being in the 18.03 branch