Merge pull request #18106 from sjenning/pick-runc-1683

Automatic merge from submit-queue (batch tested with PRs 18040, 18097, 18098, 18106, 18087). UPSTREAM: opencontainers/runc: 1683: Fix race against systemd Thanks to @vikaschoudhary16 for doing all the legwork upstream on this! Fixes #16246 opencontainers/runc#1683 google/cadvisor#1861 kubernetes/kubernetes#58117 @derekwaynecarr
openshift · Jan 15, 2018 · 7b686fc · 7b686fc
2 parents 4f7143a + 6d2d90f
commit 7b686fc
Showing 1 changed file with 4 additions and 1 deletion.
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