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
openshift · Nov 21, 2017 · 8b1c186 · 8b1c186
2 parents c4939e3 + d0428ed
commit 8b1c186
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