Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.06] Bump containerd daemon to v1.1.1#17

Merged
andrewhsu merged 1 commit intodocker-archive:18.06from
thaJeztah:18.06-backport-bump_containerd_1.1.1
Jul 10, 2018
Merged

[18.06] Bump containerd daemon to v1.1.1#17
andrewhsu merged 1 commit intodocker-archive:18.06from
thaJeztah:18.06-backport-bump_containerd_1.1.1

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

cherry-pick of moby#37425 for 18.06

cherry-pick was clean; no conflicts

ping @dmcgowan @cpuguy83 PTAL

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit c083eb7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.06.0 milestone Jul 9, 2018
Copy link
Copy Markdown

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu
Copy link
Copy Markdown

Ignoring the flakey failure:

FAIL: docker_cli_swarm_test.go:1372: DockerSwarmSuite.TestSwarmClusterRotateUnlockKey

Copy link
Copy Markdown

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 4fc6e3a into docker-archive:18.06 Jul 10, 2018
@thaJeztah thaJeztah deleted the 18.06-backport-bump_containerd_1.1.1 branch July 11, 2018 10:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants