Skip to content

Vendor swarmkit and libnetwork in master#27594

Merged
tonistiigi merged 1 commit intomoby:masterfrom
aaronlehmann:vendor-swarmkit
Oct 20, 2016
Merged

Vendor swarmkit and libnetwork in master#27594
tonistiigi merged 1 commit intomoby:masterfrom
aaronlehmann:vendor-swarmkit

Conversation

@aaronlehmann
Copy link

@aaronlehmann aaronlehmann commented Oct 20, 2016 •
edited by aboch
Loading

Also update grpc, as it was updated in swarmkit.

swarmkit fixes:
Fixes #27382
Fixes #27208
Fixes #25432
Fixes #27469
Fixes #27390

libnetwork fixes:
Fixes #27486
Fixes #27188
Brings changes needed by #23397

cc @tonistiigi @dperny

@aaronlehmann aaronlehmann changed the title Vendor swarmkit in master Vendor swarmkit and libnetwork in master Oct 20, 2016
@aaronlehmann aaronlehmann mentioned this pull request Oct 20, 2016
Merged
@mavenugo
Copy link
Contributor

mavenugo commented Oct 20, 2016

we need to get #27287 in before this PR to make sure plugin-v1 works e2e for network plugins.

Vendor swarmkit in master
12a4ed0 
Also, update libnetwork and grpc.

Signed-off-by: Aaron Lehmann <[email protected]>
@aaronlehmann
Copy link
Author

aaronlehmann commented Oct 20, 2016

Merged #27287, and rebased this PR.

@justincormack
Copy link
Contributor

justincormack commented Oct 20, 2016

Thanks! LGTM

@justincormack
Copy link
Contributor

justincormack commented Oct 20, 2016

@aluzzardi can you re-LGTM after changes...

@aboch aboch mentioned this pull request Oct 20, 2016
Closed
@amitkris amitkris mentioned this pull request Oct 20, 2016
Closed
5 tasks
@tonistiigi
Copy link
Member

tonistiigi commented Oct 20, 2016

LGTM

@tonistiigi tonistiigi merged commit eee025e into moby:master Oct 20, 2016
@thaJeztah thaJeztah added this to the 1.13.0 milestone Oct 20, 2016
This was referenced Oct 25, 2016
Closed
Closed
@tonistiigi tonistiigi mentioned this pull request Jan 18, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment