Merge pull request #18877 from sjenning/pick-runc-1754-3.9

Automatic merge from submit-queue. [3.9] UPSTREAM: opencontainers/runc: 1754: Add timeout while waiting for StartTransinetUnit completion signal master PR #18876 opencontainers/runc#1754 xref https://bugzilla.redhat.com/show_bug.cgi?id=1548358 Hold until upstream merge. @derekwaynecarr @vikaschoudhary16
openshift · Mar 8, 2018 · cb7a542 · cb7a542
2 parents 60c4264 + 9bf708a
commit cb7a542
Showing 1 changed file with 6 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