Merge pull request #16480 from sjenning/pick-runc-1344

Automatic merge from submit-queue UPSTREAM: opencontainers/runc: 1344: fix cpu.cfs_quota_us changed when n systemd daemon-reload using systemd opencontainers/runc#1344 also see https://bugzilla.redhat.com/show_bug.cgi?id=1455071 @derekwaynecarr @runcom
openshift · Sep 21, 2017 · 30080de · 30080de
2 parents d1888de + 4d43436
commit 30080de
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