Skip to content

Commit f3ab47d

Browse files
crosbymichaelcrosbymichael
authored
Merge pull request #3079 from crosbymichael/cherry-picks1.2
[release1.2] Bump cgroups to dbea6f2
2 parents 96a8180 + e8091eb commit f3ab47d

File tree

13 files changed

+278
-41
lines changed

13 files changed

+278
-41
lines changed

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
22
github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23
3-
github.com/containerd/cgroups 5e610833b72089b37d0e615de9a92dfc043757c2
3+
github.com/containerd/cgroups dbea6f2bd41658b84b00417ceefa416b979cbf10
44
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
55
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
66
github.com/containerd/btrfs 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244

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

Lines changed: 13 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/cgroups/blkio.go‎

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

‎vendor/github.com/containerd/cgroups/cgroup.go‎

Lines changed: 86 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/cgroups/control.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/cgroups/cpuset.go‎

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

‎vendor/github.com/containerd/cgroups/devices.go‎

Lines changed: 3 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/cgroups/net_prio.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/cgroups/opts.go‎

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