Skip to content

Commit 82ebb90

Browse files
crosbymichaelcrosbymichael
authored
Merge pull request #3175 from Random-Liu/update-cri-release-1.1
[release 1.1] Update cri to f8171b4530bed8992973cc4a2f24efe53b821d53.
2 parents 41b3a31 + 125c9a0 commit 82ebb90

8 files changed

Lines changed: 239 additions & 34 deletions

File tree

‎vendor.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ github.com/gotestyourself/gotestyourself 44dbf532bbf5767611f6f2a61bded572e337010
4444
github.com/google/go-cmp v0.1.0
4545

4646
# cri dependencies
47-
github.com/containerd/cri b9c06fd1410f1e6699a83277887af399a1342736 # release/1.0
47+
github.com/containerd/cri f8171b4530bed8992973cc4a2f24efe53b821d53 # release/1.0
4848
github.com/containerd/go-cni 40bcf8ec8acd7372be1d77031d585d5d8e561c90
4949
github.com/blang/semver v3.1.0
5050
github.com/containernetworking/cni v0.6.0
@@ -61,7 +61,7 @@ github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55
6161
github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f
6262
github.com/json-iterator/go 1.0.4
6363
github.com/opencontainers/runtime-tools 6073aff4ac61897f75895123f7e24135204a404d
64-
github.com/opencontainers/selinux b6fa367ed7f534f9ba25391cc2d467085dbb445a
64+
github.com/opencontainers/selinux v1.2.1
6565
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
6666
github.com/spf13/pflag v1.0.0
6767
github.com/tchap/go-patricia 5ad6cdb7538b0097d5598c7e57f0a24072adf7dc

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

Lines changed: 6 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/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.

‎vendor/github.com/opencontainers/selinux/README.md‎

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

‎vendor/github.com/opencontainers/selinux/go-selinux/label/label.go‎

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

‎vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go‎

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

0 commit comments

Comments
 (0)