Commit 8b1c186

openshift-merge-robot

authored

Merge pull request #17349 from sjenning/runc-pick-1651-3.7

Automatic merge from submit-queue. [3.7] UPSTREAM: opencontainer/runc: 1651: systemd: adjust CPUQuotaPerSecUSec to compensate for systemd internal handling master PR #17348 @derekwaynecarr @mrunalp @jupierce

2 parents c4939e3 + d0428ed commit 8b1c186Copy full SHA for 8b1c186

1 file changed

+7

-0

lines changed

vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd
- apply_systemd.go

1 file changed

+7

-0

lines changed

`‎vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go‎`

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

Comments

(0)