Merge pull request #17839 from sjenning/runc-pick-1651-3.8

Automatic merge from submit-queue. [3.8] UPSTREAM: opencontainers/runc: 1651: systemd: adjust CPUQuotaPerSecUSec to compensate for systemd internal handling opencontainers/runc#1651 master PR: #17348 @derekwaynecarr @mrunalp @jupierce @eparis @smarterclayton
openshift · Jan 5, 2018 · 1e51aef · 1e51aef
2 parents 9bf3901 + 7c4591e
commit 1e51aef
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