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

[backport 17.06] Overlay fix for IP reuse #1912

Merged
merged 2 commits into from
Aug 16, 2017

Conversation

fcrisciani
Copy link

Restore previously reverted fix: #1792
Backport fix that ensure proper OS thread locking: #1911

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "overlay-fix-backport" git@github.com:fcrisciani/libnetwork.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354087136
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

@fcrisciani fcrisciani changed the base branch from master to bump_17.06 August 16, 2017 16:33
Santhosh Manohar and others added 2 commits August 16, 2017 09:34
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
(cherry picked from commit ae6824e)
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Prevents an issue where the goroutine may jump to a new OS thread during
execution putting it into a mount/network NS that is unexpected.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 65bb58f)
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Copy link
Contributor

@mavenugo mavenugo left a comment

Choose a reason for hiding this comment

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

LGTM

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.

4 participants