8000 Merge pull request #339 from thaJeztah/19.03_backport_fix_containerd_… · docker-archive/engine@0b12b76 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 0b12b76

Browse files
thaJeztahthaJeztah
authored
Merge pull request #339 from thaJeztah/19.03_backport_fix_containerd_optional_docker_content_digest
[19.03 backport] vendor: containerd to 7c1e88399
2 parents 9cc467c + f1a639b commit 0b12b76

File tree

17 files changed

+135
-63
lines changed

17 files changed

+135
-63
lines changed

‎vendor.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ github.com/googleapis/gax-go 317e0006254c44a0ac427cc52a0e
119119
google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9
120120

121121
# containerd
122-
github.com/containerd/containerd 3a3f0aac8819165839a41fee77a4f4ac8b103097
122+
github.com/containerd/containerd 7c1e88399ec0b0b077121d9d5ad97e647b11c870
123123
github.com/containerd/fifo a9fb20d87448d386e6d50b1f2e1fa70dcf0de43c
124124
github.com/containerd/continuity aaeac12a7ffcd198ae25440a9dff125c2e2703a7
125125
github.com/containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
126126
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
127127
github.com/containerd/go-runc 7d11b49dc0769f6dbb0d1b19f3d48524d1bad9ad
128128
github.com/containerd/typeurl 2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d
129-
github.com/containerd/ttrpc f02858b1457c5ca3aaec3a0803eb0d59f96e41d6
129+
github.com/containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
130130
github.com/gogo/googleapis d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0
131131

132132
# cluster

‎vendor/github.com/containerd/containerd/README.md‎

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/images/archive/importer.go‎

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

‎vendor/github.com/containerd/containerd/metadata/content.go‎

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

‎vendor/github.com/containerd/containerd/mount/mount_linux.go‎

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/containerd/containerd/remotes/docker/handler.go‎

Copy file name to clipboard
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/remotes/docker/resolver.go‎

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

‎vendor/github.com/containerd/containerd/remotes/docker/schema1/converter.go‎

Lines changed: 12 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/containerd/runtime/v1/linux/bundle.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/containerd/runtime/v1/linux/proc/deleted_state.go‎

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

0 commit comments

Comments
 (0)
0