Merge pull request #31852 from mlaventure/update-containerd-17.03

[17.03.1] Update containerd to version 4ab9917febca54791c5f071a9d1f404867857fcc
This commit is contained in:
Victor Vieux 2017-03-15 10:49:52 -07:00 committed by GitHub
commit 3476dbfb36
2 changed files with 2 additions and 2 deletions

View file

@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
RUNC_COMMIT=54296cf40ad8143b62dbcaa1d90e520a2136ddfe
CONTAINERD_COMMIT=595e75c212d19a81d2b808a518fe1afc1391dad5
CONTAINERD_COMMIT=4ab9917febca54791c5f071a9d1f404867857fcc
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
VNDR_COMMIT=f56bd4504b4fad07a357913687fb652ee54bb3b0

View file

@ -97,7 +97,7 @@ google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0
github.com/docker/docker-credential-helpers f72c04f1d8e71959a6d103f808c50ccbad79b9fd
# containerd
github.com/docker/containerd 595e75c212d19a81d2b808a518fe1afc1391dad5
github.com/docker/containerd 4ab9917febca54791c5f071a9d1f404867857fcc
github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4
# cluster