Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Nov 21, 2018

The previous update used a commit from master. Now that all the fixes are backported to the containerd 1.2 release branch, we can switch back to that branch.

planning to backport this to docker engine 18.09.1

full diff for the containerd runtime; https://github.com/containerd/containerd/compare/aa537a67b3a9026c423a63dbaf71e4cc0776b2ad..v1.2.0-rc.0

The previous update used a commit from master. Now that
all the fixes are backported to the containerd 1.2 release
branch, we can switch back to that branch.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

ping @tonistiigi PTAL

@dmcgowan
Copy link
Member

LGTM

@AkihiroSuda AkihiroSuda merged commit 74baf62 into moby:master Nov 22, 2018
@thaJeztah thaJeztah deleted the bump_containerd_v1.2.1 branch November 22, 2018 07: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.

5 participants