Skip to content

[19.03] Fix dns fallback regression#41009

Merged
thaJeztah merged 3 commits intomoby:19.03from
tiborvass:19.03-fix-dns-fallback-regression
May 28, 2020
Merged

[19.03] Fix dns fallback regression#41009
thaJeztah merged 3 commits intomoby:19.03from
tiborvass:19.03-fix-dns-fallback-regression

Conversation

@tiborvass
Copy link
Copy Markdown
Contributor

@tiborvass tiborvass commented May 21, 2020

Fixes #41003
fixes #41041

Ref moby/libnetwork#2551

Backport of #41008

@tiborvass tiborvass added this to the 19.03.10 milestone May 21, 2020
@tiborvass tiborvass changed the title 19.03 fix dns fallback regression [19.03] Fix dns fallback regression May 21, 2020
Copy link
Copy Markdown
Member

@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 pending master PR merge.

@tiborvass tiborvass force-pushed the 19.03-fix-dns-fallback-regression branch from ec32100 to 273943f Compare May 21, 2020 20:13
@tiborvass tiborvass marked this pull request as draft May 21, 2020 23:04
@tiborvass tiborvass marked this pull request as ready for review May 21, 2020 23:04
@thaJeztah
Copy link
Copy Markdown
Member

Same comment here as on #41008 (comment)

@tiborvass I see you reverted the bump (probably to verify the integration-test); could you

  • remove the revert
  • swap the "bump" and "test-case", so that git bisect doesn't break?
  • move this PR out of draft

@tiborvass tiborvass marked this pull request as draft May 26, 2020 16:38
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit b280ea1)
Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass tiborvass force-pushed the 19.03-fix-dns-fallback-regression branch 3 times, most recently from 8c8bb8d to 37bf1eb Compare May 28, 2020 10:16
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

found one typo in a comment, but not a blocker

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

😬 s/18.03/19.03/ ?

Tibor Vass added 2 commits May 28, 2020 10:52
Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e5ad8b14daf0a1ddb12c0b83d153531afffb908b)
Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass tiborvass force-pushed the 19.03-fix-dns-fallback-regression branch from 37bf1eb to c104a50 Compare May 28, 2020 10:52
@thaJeztah
Copy link
Copy Markdown
Member

(moving this out of draft)

@thaJeztah thaJeztah marked this pull request as ready for review May 28, 2020 11:02
@thaJeztah thaJeztah requested a review from tianon as a code owner May 28, 2020 11:02
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM (assuming green)

@thaJeztah
Copy link
Copy Markdown
Member

All green now; merging

@thaJeztah thaJeztah merged commit b85d75e into moby:19.03 May 28, 2020
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.

5 participants