Skip to content

Commit

Permalink
Merge pull request #1147 from dcantah/revert-ctrd
Browse files Browse the repository at this point in the history
[release/0.8] Revert containerd dep to 1.4.9
  • Loading branch information
dcantah authored Sep 10, 2021
2 parents 54f80fb + 1d6647b commit 717ae58
Show file tree
Hide file tree
Showing 232 changed files with 13,276 additions and 50,865 deletions.
5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ require (
github.com/Microsoft/go-winio v0.4.17
github.com/containerd/cgroups v1.0.1
github.com/containerd/console v1.0.2
github.com/containerd/containerd v1.5.1
github.com/containerd/containerd v1.4.9
github.com/containerd/continuity v0.1.0 // indirect
github.com/containerd/fifo v1.0.0 // indirect
github.com/containerd/go-runc v1.0.0
github.com/containerd/ttrpc v1.0.2
github.com/containerd/typeurl v1.0.2
Expand All @@ -19,6 +21,7 @@ require (
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
google.golang.org/grpc v1.33.2
gotest.tools/v3 v3.0.3 // indirect
)

replace (
Expand Down
660 changes: 8 additions & 652 deletions go.sum

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/events/container.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/events/content.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/events/image.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/events/namespace.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/events/snapshot.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/events/task.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/types/descriptor.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/types/metrics.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/types/mount.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/types/platform.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/containerd/containerd/api/types/task/task.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 3 additions & 11 deletions vendor/github.com/containerd/containerd/log/context.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 17 additions & 13 deletions vendor/github.com/containerd/containerd/mount/lookup_unix.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 717ae58

Please sign in to comment.