Skip to content

Vendor libnetwork v0.7.0-dev.2#20214

Merged
estesp merged 1 commit into
moby:masterfrom
mavenugo:vin0.7.0-dev.1
Feb 11, 2016
Merged

Vendor libnetwork v0.7.0-dev.2#20214
estesp merged 1 commit into
moby:masterfrom
mavenugo:vin0.7.0-dev.1

Conversation

@mavenugo
Copy link
Copy Markdown
Contributor

Signed-off-by: Madhu Venugopal madhu@docker.com

@thaJeztah
Copy link
Copy Markdown
Member

LGTM

@moxiegirl
Copy link
Copy Markdown
Contributor

test this please

- Expose EnableIPV6 option
- discoverapi refactoring
- Fixed a few typos & docs update
- Fixes moby#20140

Signed-off-by: Madhu Venugopal <madhu@docker.com>
@mavenugo mavenugo changed the title Vendor libnetwork v0.7.0-dev.1 Vendor libnetwork v0.7.0-dev.2 Feb 11, 2016
@cpuguy83
Copy link
Copy Markdown
Member

LGTM

@tiborvass tiborvass changed the title Vendor libnetwork v0.7.0-dev.2 DO NOT MERGE Vendor libnetwork v0.7.0-dev.2 Feb 11, 2016
Comment thread hack/vendor.sh

#get libnetwork packages
clone git github.com/docker/libnetwork v0.6.1-rc2
clone git github.com/docker/libnetwork v0.7.0-dev.2
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

is this 0.7 bump expected?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes. It's our dev branch in libnetwork which aligns with docker master for 1.11

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

So you confirm it's not diverging from the 1.10 branch ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

to be clear. everything in libnetwork 0.7.x is meant for 1.11 and not for 1.10 release branch.
After this commit, anything specific to 1.10 must go into the bump release branch (1.10.1).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

So if we merge this, this won't be in 1.10.1. Correct?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

correct. I will push a individual patch in 1.10.1 that fixes #20140 alone. Since it is a P3 and not specific to 1.10 (it was seen also in 1.9), we can decide to pick it up or not, based on priority and release requirements.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fair enough

@tiborvass tiborvass changed the title DO NOT MERGE Vendor libnetwork v0.7.0-dev.2 Vendor libnetwork v0.7.0-dev.2 Feb 11, 2016
@estesp
Copy link
Copy Markdown
Contributor

estesp commented Feb 11, 2016

LGTM

estesp added a commit that referenced this pull request Feb 11, 2016
@estesp estesp merged commit 6672d7d into moby:master Feb 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment