Merge pull request #3864 from Random-Liu/update-cri-release-1.3

[release/1.3] Update cri to b1bef15fbeb6c6f0569b67322acfa74ca3597755.
containerd · Dec 2, 2019 · e987ea3 · e987ea3
2 parents 070c272 + 8bbd71e
commit e987ea3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 27 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -51,7 +51,7 @@ github.com/cpuguy83/go-md2man v1.0.10
 github.com/russross/blackfriday v1.5.2
 
 # cri dependencies
-github.com/containerd/cri 5d49e7e51b43e36a6b9c4386257c7d08c602237f # release/1.3
+github.com/containerd/cri b1bef15fbeb6c6f0569b67322acfa74ca3597755 # release/1.3
 github.com/containerd/go-cni 49fbd9b210f3c8ee3b7fd3cd797aabaf364627c1
 github.com/containernetworking/cni v0.7.1
 github.com/containernetworking/plugins v0.7.6

diff --git a/vendor/github.com/containerd/cri/pkg/config/config.go b/vendor/github.com/containerd/cri/pkg/config/config.go
diff --git a/vendor/github.com/containerd/cri/pkg/server/image_pull.go b/vendor/github.com/containerd/cri/pkg/server/image_pull.go