Commit 1f2181c

openshift-merge-robot

authored

Merge pull request #16482 from sjenning/pick-runc-1344-3.6

Automatic merge from submit-queue UPSTREAM: opencontainers/runc: 1344: fix cpu.cfs_quota_us changed when systemd daemon-reload using systemd opencontainers/runc#1344 master PR: #16480 also see https://bugzilla.redhat.com/show_bug.cgi?id=1455071 @derekwaynecarr @runcom

2 parents b3b8ade + 46ac4a2 commit 1f2181cCopy full SHA for 1f2181c

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`

+7

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

Comments

(0)