Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit 6f8dc60

Browse files
committed
Sync vendors with containerd 1.2.11
Look through the `containerd dependencies` in vendor.conf, for each dependency / SHA, check if the SHA is newer in containerd's vendor.conf in 1.2.11 tag. Update if necessary. Drop unused packages. Add package that was not present. Signed-off-by: Davanum Srinivas <[email protected]>
1 parent b075cc4 commit 6f8dc60

45 files changed

Lines changed: 10218 additions & 20 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

vendor.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ github.com/blang/semver v3.1.0
33
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
44
github.com/containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
55
github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23
6-
github.com/containerd/containerd v1.2.10
6+
github.com/containerd/containerd v1.2.11
77
github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
88
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
99
github.com/containerd/go-cni 40bcf8ec8acd7372be1d77031d585d5d8e561c90
@@ -39,7 +39,7 @@ github.com/modern-go/concurrent 1.0.3
3939
github.com/modern-go/reflect2 1.0.1
4040
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
4141
github.com/opencontainers/image-spec v1.0.1
42-
github.com/opencontainers/runc 3e425f80a8c931f88e6d94a8c831b9d5aa481657
42+
github.com/opencontainers/runc d736ef14f0288d6993a1845745d6756cfc9ddd5a
4343
github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353
4444
github.com/opencontainers/runtime-tools v0.6.0
4545
github.com/opencontainers/selinux v1.2.2
@@ -66,6 +66,7 @@ golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
6666
golang.org/x/sys 41f3e6584952bb034a481797859f6ab34b6803bd https://github.com/golang/sys
6767
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
6868
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
69+
google.golang.org/appengine v1.5.0
6970
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
7071
google.golang.org/grpc 6eaf6f47437a6b4e2153a190160ef39a92c7eceb
7172
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4

vendor/github.com/containerd/containerd/runtime/v1/linux/task.go

Lines changed: 9 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/containerd/runtime/v1/shim/service.go

Lines changed: 2 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/containerd/runtime/v2/shim.go

Lines changed: 11 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/containerd/services/tasks/local.go

Lines changed: 2 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/containerd/snapshots/storage/bolt.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.

vendor/github.com/containerd/containerd/vendor.conf

Lines changed: 3 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/containerd/version/version.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.

vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go

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

vendor/github.com/opencontainers/runc/libcontainer/configs/config.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.

0 commit comments

Comments
 (0)