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
openshift · Sep 22, 2017 · 1f2181c · 1f2181c
2 parents b3b8ade + 46ac4a2
commit 1f2181c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go