Skip to content

Conversation

@thaJeztah
Copy link
Member

backport of #2802 for 18.03

Minor conflict in import statements, due to #2750 not being in the 18.03 branch

diff --cc manager/state/raft/util.go
index da44dca6,1a49f76c..00000000
--- a/manager/state/raft/util.go
+++ b/manager/state/raft/util.go
@@@ -1,10 -1,10 +1,15 @@@
  package raft
  
  import (
++<<<<<<< HEAD
++=======
+       "context"
+       "net"
++>>>>>>> 3a531f45... use a custom grpc dialer when managers are joining
        "time"
  
 +      "golang.org/x/net/context"
 +
        "github.com/docker/swarmkit/api"
        "github.com/docker/swarmkit/manager/state"
        "github.com/docker/swarmkit/manager/state/store"

@codecov
Copy link

codecov bot commented Feb 11, 2019

Codecov Report

❗ No coverage uploaded for pull request base (bump_v18.03@18bd8d7). Click here to learn what that means.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             bump_v18.03    #2828   +/-   ##
==============================================
  Coverage               ?   61.58%           
==============================================
  Files                  ?      134           
  Lines                  ?    21834           
  Branches               ?        0           
==============================================
  Hits                   ?    13446           
  Misses                 ?     6935           
  Partials               ?     1453

@thaJeztah thaJeztah changed the title [18.03 backport] use a custom grpc dialer when managers are joining [WIP][18.03 backport] use a custom grpc dialer when managers are joining Feb 11, 2019
@thaJeztah
Copy link
Member Author

marking this "WIP" because there's some comments on the original PR, and we should have it merged in master first

@wk8
Copy link
Contributor

wk8 commented Feb 13, 2019

LGTM once the original PR is merged

Signed-off-by: Dani Louca <[email protected]>
(cherry picked from commit 85aeb0b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 18.03_backport_esc_1003_alt branch from 4bd5bb8 to a4e920f Compare March 5, 2019 21:52
@thaJeztah thaJeztah changed the title [WIP][18.03 backport] use a custom grpc dialer when managers are joining [18.03 backport] use a custom grpc dialer when managers are joining Mar 5, 2019
@dperny dperny merged commit 21a0b95 into moby:bump_v18.03 Mar 6, 2019
@thaJeztah thaJeztah deleted the 18.03_backport_esc_1003_alt branch March 6, 2019 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants