Commit 6912595

openshift-merge-robot

authored

Merge pull request #17348 from sjenning/runc-pick-1651

Automatic merge from submit-queue. UPSTREAM: opencontainer/runc: 1651: systemd: adjust CPUQuotaPerSecUSec to compensate for systemd internal handling opencontainers/runc#1651 holding on master rebase @derekwaynecarr @mrunalp @jupierce

2 parents b040346 + d407dc9 commit 6912595Copy full SHA for 6912595

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)