Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[18.09 backport] fixes #1441 set default schema to tcp for docker host #1454

Merged
merged 2 commits into from
Nov 27, 2018

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Oct 17, 2018

backport of #1443 for 18.09
fixes #1441
fixes moby/moby#38118

git checkout -b 18.09_backport_defaulttcpschema upstream/18.09 
git cherry-pick -s -S -x 2431dd144809812e8d3bb03d22af01703a5d36cd
git cherry-pick -s -S -x beed8748c0b7072db3cc1d8a2680a8b4856922a6
git push -u origin

cherry-pick was clean; no conflicts

Signed-off-by: Lifubang <lifubang@acmcoder.com>
(cherry picked from commit 2431dd1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Lifubang <lifubang@acmcoder.com>
(cherry picked from commit beed874)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Copy link
Collaborator

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-io
Copy link

Codecov Report

Merging #1454 into 18.09 will decrease coverage by <.01%.
The diff coverage is 66.66%.

@@            Coverage Diff             @@
##            18.09    #1454      +/-   ##
==========================================
- Coverage   54.07%   54.06%   -0.01%     
==========================================
  Files         290      290              
  Lines       19391    19390       -1     
==========================================
- Hits        10485    10484       -1     
  Misses       8237     8237              
  Partials      669      669

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@lifubang lifubang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zmilonas
Copy link

Is there a reason this wasn't merged?

Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit 3f79899 into docker:18.09 Nov 27, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_defaulttcpschema branch November 27, 2018 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants