Merge pull request containerd#3999 from thaJeztah/bump_cri

vendor: bump cri, gopkg.in/yaml.v2 v2.2.8
zhsj · Feb 4, 2020 · 4f348c5 · 4f348c5
2 parents f5d8ff5 + 263ab70
commit 4f348c5
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 64 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -53,7 +53,7 @@ google.golang.org/grpc                              39e8a7b072a67ca2a75f57fa2e0d
 gotest.tools                                        1083505acf35a0bd8a696b26837e1fb3187a7a83 # v2.3.0
 
 # cri dependencies
-github.com/containerd/cri                           19589b4bf9663815649f1125fb45a1674d52a702 # master
+github.com/containerd/cri                           c0294ebfe0b4342db85c0faf7727ceb8d8c3afce # master
 github.com/containerd/go-cni                        0d360c50b10b350b6bb23863fd4dfb1c232b01c9
 github.com/containernetworking/cni                  4cfb7b568922a3c79a23e438dc52fe537fc9687e # v0.7.1
 github.com/containernetworking/plugins              9f96827c7cabb03f21d86326000c00f61e181f6a # v0.7.6
@@ -74,7 +74,7 @@ golang.org/x/crypto                                 69ecbb4d6d5dab05e49161c6e77e
 golang.org/x/oauth2                                 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33
 golang.org/x/time                                   9d24e82272b4f38b78bc8cff74fa936d31ccd8ef
 gopkg.in/inf.v0                                     d2d2541c53f18d2a059457998ce2876cc8e67cbf # v0.9.1
-gopkg.in/yaml.v2                                    f221b8435cfb71e54062f6c6e99e9ade30b124d5 # v2.2.4
+gopkg.in/yaml.v2                                    53403b58ad1b561927d19068c655246f2db79d48 # v2.2.8
 k8s.io/api                                          7643814f1c97f24ccfb38c2b85a7bb3c7f494346 # kubernetes-1.17.1
 k8s.io/apimachinery                                 79c2a76c473a20cdc4ce59cae4b72529b5d9d16b # kubernetes-1.17.1
 k8s.io/apiserver                                    5381f05fcb881d39af12eeecab5645364229300c # kubernetes-1.17.1

diff --git a/vendor/github.com/containerd/cri/vendor.conf b/vendor/github.com/containerd/cri/vendor.conf
diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go
diff --git a/vendor/gopkg.in/yaml.v2/scannerc.go b/vendor/gopkg.in/yaml.v2/scannerc.go
diff --git a/vendor/gopkg.in/yaml.v2/yaml.go b/vendor/gopkg.in/yaml.v2/yaml.go
diff --git a/vendor/gopkg.in/yaml.v2/yamlh.go b/vendor/gopkg.in/yaml.v2/yamlh.go