Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[17.06] vndr libnetwork to bring in fix for overlay network ip reuse #197

Merged
merged 1 commit into from
Aug 17, 2017
Merged

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Aug 17, 2017

vndr libnetwork to specifically bring in this fix:

comparison of changes from the libnetwork repo: moby/libnetwork@2102668...9397626

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 17.06.1 milestone Aug 17, 2017
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

@mavenugo
Copy link
Contributor

mavenugo commented Aug 17, 2017

@andrewhsu

This change doesnt include :
docker/libnetwork#1901 Revert "Remove dynamic mac entry from fdb on endpoint deletion"

Pls remove it from the description.

Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

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

LGTM

@fcrisciani
Copy link

@mavenugo the diff does not show it because 17.06-CE did not vendor the libnetwork branch with the revert, so the final result is like that revert never happened

@mavenugo
Copy link
Contributor

@fcrisciani thats correct. and hence, we should remove it from the description :)

@andrewhsu andrewhsu merged commit 99a2732 into docker-archive:17.06 Aug 17, 2017
@andrewhsu andrewhsu deleted the ven-ln branch August 17, 2017 17:46
@athurg
Copy link

athurg commented Aug 23, 2017

I am completely confused.

Could you tell me whether docker-ce 17.06-1 include this fix or not?

I see the git commit from the released docker version is 874a737. Which is the children of commit 4770c7a and 99a2732 . These commits looks like included this PR.

And you guys's discussion here and the official release notes in https://docs.docker.com/release-notes/docker-ce/#17061-ce-2017-08-15 is shown this PR is not included.

@fcrisciani
Copy link

@athurg the patch is part of docker-ce 17.06.1.
The confusion comes from the fact that the issue overlay issue was fixed around 1 month ago, but during the testing of the recent RCs we found out that the specific patch was introducing a regression so we had to revert it for a week.
During this time docker-ce did not revendor libnetwork so that overlay issue never got introduced back to this repository. If you see the diff of libnetwork you can see the whole history where the patch is reverted: moby/libnetwork@2d5f452 and when it is brought back: moby/libnetwork@9587764 with the addition of the fix of the regression: moby/libnetwork@3113346

Hope this clarify the confusion, let me know if you have other questions

@athurg
Copy link

athurg commented Aug 24, 2017

OK, I got it. Thanks for your explanation!

seemethere added a commit that referenced this pull request Sep 12, 2018
Bump proxy to 35c543b
Upstream-commit: 7d48c4e
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants