Skip to content

vendorin libnetwork @f9fa6e0#29891

Merged
thaJeztah merged 2 commits intomoby:masterfrom
sanimej:libnvendor
Jan 11, 2017
Merged

vendorin libnetwork @f9fa6e0#29891
thaJeztah merged 2 commits intomoby:masterfrom
sanimej:libnvendor

Conversation

@sanimej
Copy link

@sanimej sanimej commented Jan 4, 2017 •
edited by aboch
Loading

fixes docker #28836
fixes docker #22004
fixes docker #20569
fixes docker #27539
fixes docker #23910
fixes docker #14627
fixes docker #29100
fixes #29726

Signed-off-by: Santhosh Manohar santhosh@docker.com

@AkihiroSuda AkihiroSuda added the status/failing-ci Indicates that the PR in its current state fails the test suite label Jan 5, 2017
@allencloud
Copy link
Contributor

allencloud commented Jan 6, 2017

also fixes #29726

@thaJeztah
Copy link
Member

thaJeztah commented Jan 9, 2017

@sanimej CI is failing for various tests; looks related. Also; looking at comments in the the linked issues, should this be included in 1.13?

/cc @vieux @tiborvass

@thaJeztah thaJeztah mentioned this pull request Jan 9, 2017
Merged
@mavenugo
Copy link
Contributor

mavenugo commented Jan 9, 2017

@thaJeztah this PR is targeted only for master. The required patch for #28836 is already in 1.13 branch via #29858

@sanimej
Copy link
Author

sanimej commented Jan 9, 2017

@thaJeztah This is only for master. Couple of more PRs have been merged in libnetwork. I will update the PR to pick up the latest libnetwork and also fix the IT issues.

@sanimej sanimej changed the title vendorin libnetwork @d2edad309cc874e865b5ba4d6bd6b276c93451d3 vendorin libnetwork @f9fa6e0 Jan 9, 2017
@sanimej sanimej force-pushed the libnvendor branch 2 times, most recently from b82c934 to 3629fb6 Compare January 10, 2017 17:44
vendorin libnetwork @d2edad309cc874e865b5ba4d6bd6b276c93451d3
a0dcdcb 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Handle IPv6 enabling correctly in the tests
d5e8d8e 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
@mavenugo
Copy link
Contributor

mavenugo commented Jan 11, 2017

@aboch the CI is green. can you PTAL the docker IT changes ?

@thaJeztah thaJeztah removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Jan 11, 2017
@thaJeztah thaJeztah added this to the 1.14.0 milestone Jan 11, 2017
vdemeester
vdemeester approved these changes Jan 11, 2017
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐸

@aboch
Copy link
Contributor

aboch commented Jan 11, 2017

Looks good to me

thaJeztah
thaJeztah approved these changes Jan 11, 2017
View reviewed changes
Copy link
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

@thaJeztah thaJeztah merged commit de54284 into moby:master Jan 11, 2017
@bboreham bboreham mentioned this pull request Jan 11, 2017
Closed
@thaJeztah thaJeztah mentioned this pull request Jan 17, 2017
Merged
@sanimej sanimej mentioned this pull request Jan 25, 2017
Closed
@thaJeztah
Copy link
Member

thaJeztah commented Jan 25, 2017

Fixes #541 as well; adding impact/changelog

@amarouni amarouni mentioned this pull request Mar 31, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment