Skip to content

[17.06] Fix for docker intercepting DNS requests on ICS network - #2076

Merged
fcrisciani merged 1 commit into
moby:bump_17.06from
thaJeztah:17.06-icsdnsissue
Feb 22, 2018
Merged

fcrisciani merged 1 commit into
moby:bump_17.06from
thaJeztah:17.06-icsdnsissue

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

cherry-pick of #2014 for 17.06

git checkout -b 17.06-icsdnsissue upstream/bump_17.06
git cherry-pick -s -S -x ba2de36fb4877b19f24c3dbe822c384887c7bca6

no conflicts

Signed-off-by: Sandeep Bansal <sabansal@microsoft.com>
(cherry picked from commit ba2de36)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah

Copy link
Copy Markdown
Member Author

ping @carlfischer1

@fcrisciani
fcrisciani merged commit 5f18bd2 into moby:bump_17.06 Feb 22, 2018
@thaJeztah
thaJeztah deleted the 17.06-icsdnsissue branch February 22, 2018 18:50
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