close
Skip to content

Vendor swarmkit#29047

Merged
vieux merged 1 commit into
moby:1.12.xfrom
aaronlehmann:vendor-1.12-swarmkit
Dec 2, 2016
Merged

Vendor swarmkit#29047
vieux merged 1 commit into
moby:1.12.xfrom
aaronlehmann:vendor-1.12-swarmkit

Conversation

@aaronlehmann

Copy link
Copy Markdown

This brings in two fixes from the bump_v1.12.4 branch of swarmkit:

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
@aluzzardi

Copy link
Copy Markdown
Member

/cc @thaJeztah @vieux

@aaronlehmann aaronlehmann changed the title Vendor swarmkit [1.12.4] Vendor swarmkit Dec 2, 2016
@vieux

vieux commented Dec 2, 2016

Copy link
Copy Markdown
Contributor

@johnstep can you please try this one, since there is no CI for 1.12.x on Windows

@johnstep

johnstep commented Dec 2, 2016

Copy link
Copy Markdown
Member

LGTM on Windows. It built successfully on Windows (for Windows) and all unit tests passed. I rebuilt and tested again with the resulting binaries, and that succeeded.

@vieux vieux changed the title [1.12.4] Vendor swarmkit [1.12.x] Vendor swarmkit Dec 2, 2016
@vieux

vieux commented Dec 2, 2016

Copy link
Copy Markdown
Contributor

ping @LK4D4 @tonistiigi

@tonistiigi

Copy link
Copy Markdown
Member

LGTM

@vieux vieux merged commit 6756f1d into moby:1.12.x Dec 2, 2016
@vieux vieux added this to the 1.12.4 milestone Dec 7, 2016
@vieux vieux changed the title [1.12.x] Vendor swarmkit Vendor swarmkit Dec 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants