commit d2532c636f03ea12744c4aec62562d78e5cde8ae
author Victor Vieux <victorvieux@gmail.com> Wed Mar 15 10:51:54 2017 -0700
committer GitHub <noreply@github.com> Wed Mar 15 10:51:54 2017 -0700
tree f1de74d0dafb93f74caa285481a5139539382758
parent b2fc918c5aa6d0c96953acaf62f9fb38049b608e
parent 99280133c25f4573b52008aa93fe2ceb58459178

Merge pull request #31853 from mlaventure/update-containerd-17.04

[17.04] Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73

hack/dockerfile/binaries-commits

diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits
index 9830f9a..50f8f34 100644
--- a/hack/dockerfile/binaries-commits
+++ b/hack/dockerfile/binaries-commits
@@ -4,7 +4,7 @@
 
 # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
 RUNC_COMMIT=9c2d8d184e5da67c95d601382adf14862e4f2228
-CONTAINERD_COMMIT=7c92ec529830300eae0f524a45f7b7394104d4f5
+CONTAINERD_COMMIT=422e31ce907fd9c3833a38d7b8fdd023e5a76e73
 TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
 VNDR_COMMIT=19220953c4a45310a4c404b7905154e29120249e

vendor.conf

diff --git a/vendor.conf b/vendor.conf
index e161190..917f886 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -100,7 +100,7 @@
 github.com/docker/docker-credential-helpers v0.5.0
 
 # containerd
-github.com/docker/containerd 7c92ec529830300eae0f524a45f7b7394104d4f5
+github.com/docker/containerd 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4
 
 # cluster