Skip to content

Commit 705b852

Browse files
estespestesp
authored
Merge pull request #4323 from crosbymichael/cri-bump1.4x
Bump CRI for 1.4x release
2 parents ae2f3fd + 785f4c5 commit 705b852

13 files changed

Lines changed: 68 additions & 18 deletions

File tree

‎vendor.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ gotest.tools/v3 v3.0.2
5656
github.com/cilium/ebpf 4032b1d8aae306b7bb94a2a11002932caf88c644
5757

5858
# cri dependencies
59-
github.com/containerd/cri 62c91260d2f43b57fff408a9263a800b7a06a647 # master
59+
github.com/containerd/cri 4f8a580795344b0f4c1146a3abce0409962f3890 # master
6060
github.com/davecgh/go-spew v1.1.1
6161
github.com/docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f
6262
github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
@@ -65,7 +65,7 @@ github.com/google/gofuzz v1.1.0
6565
github.com/json-iterator/go v1.1.8
6666
github.com/modern-go/concurrent 1.0.3
6767
github.com/modern-go/reflect2 v1.0.1
68-
github.com/opencontainers/selinux v1.5.2
68+
github.com/opencontainers/selinux bb88c45a3863dc4c38320d71b890bb30ef9feba4
6969
github.com/seccomp/libseccomp-golang v0.9.1
7070
github.com/stretchr/testify v1.4.0
7171
github.com/tchap/go-patricia v2.2.6

‎vendor/github.com/containerd/cri/pkg/config/config.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/config/config_unix.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/config/config_windows.go‎

Lines changed: 2 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/containerd/opts/spec_windows.go‎

Lines changed: 12 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/container_create.go‎

Lines changed: 7 additions & 2 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/container_create_windows.go‎

Lines changed: 23 additions & 6 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/image_pull.go‎

Lines changed: 2 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/sandbox_run.go‎

Lines changed: 0 additions & 3 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: 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)