Skip to content

Vendor the latest swarmkit#28251

Merged
aaronlehmann merged 2 commits intomoby:masterfrom
cyli:re-vendor-swarmkit
Nov 10, 2016
Merged

Vendor the latest swarmkit#28251
aaronlehmann merged 2 commits intomoby:masterfrom
cyli:re-vendor-swarmkit

Conversation

@cyli
Copy link
Contributor

@cyli cyli commented Nov 10, 2016

This provides the bugfix moby/swarmkit#1740, and fixes the test for rotating swarm unlock keys (thanks @aaronlehmann for tracking this down!)

fixes #28240

cyli added 2 commits November 10, 2016 11:48
…updating the

previous generation unlock key.

Signed-off-by: cyli <cyli@twistedmatrix.com>
Signed-off-by: cyli <cyli@twistedmatrix.com>
@aaronlehmann
Copy link

Fixes #28240

@aaronlehmann
Copy link

LGTM

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 🐸

@vieux
Copy link
Contributor

vieux commented Nov 10, 2016

LGTM

@aaronlehmann aaronlehmann merged commit 2161f35 into moby:master Nov 10, 2016
@cyli cyli deleted the re-vendor-swarmkit branch November 10, 2016 21:58
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.

Flaky test: DockerSwarmSuite.TestSwarmRotateUnlockKey

5 participants