Skip to content

Commit a558638

Browse files
mxpvmxpv
authored
Merge pull request #3993 from thaJeztah/1.2_update_containerd_cri
[release/1.2] vendor: bump containerd/cri b075cc4e9f394780dbed101601c48dcc3d37c828 (release/1.2 branch)
2 parents 92b40b6 + c12aaf0 commit a558638

13 files changed

Lines changed: 179 additions & 71 deletions

File tree

‎vendor.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ github.com/google/go-cmp v0.1.0
4343
go.etcd.io/bbolt v1.3.1-etcd.8
4444

4545
# cri dependencies
46-
github.com/containerd/cri bab7348fcfcc795e0dda2cc02e8cac6316c85edc # release/1.2 branch
46+
github.com/containerd/cri b075cc4e9f394780dbed101601c48dcc3d37c828 # release/1.2 branch
4747
github.com/containerd/go-cni 40bcf8ec8acd7372be1d77031d585d5d8e561c90
4848
github.com/blang/semver v3.1.0
4949
github.com/containernetworking/cni v0.6.0
@@ -72,7 +72,7 @@ golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
7272
golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
7373
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
7474
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
75-
gopkg.in/yaml.v2 v2.2.1
75+
gopkg.in/yaml.v2 53403b58ad1b561927d19068c655246f2db79d48 # v2.2.8
7676
k8s.io/api kubernetes-1.12.0
7777
k8s.io/apimachinery kubernetes-1.12.0
7878
k8s.io/apiserver kubernetes-1.12.0

‎vendor/github.com/containerd/cri/pkg/client/client.go‎

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/server/events.go‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/server/helpers.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/server/restart.go‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/store/container/status.go‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/vendor.conf‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/yaml.v2/decode.go‎

Lines changed: 44 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/yaml.v2/encode.go‎

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/yaml.v2/resolve.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)