Merge pull request #18876 from sjenning/pick-runc-1754

Automatic merge from submit-queue (batch tested with PRs 18778, 18709, 18876, 18897, 18652). UPSTREAM: opencontainers/runc: 1754: Add timeout while waiting for StartTransinetUnit completion signal opencontainers/runc#1754 xref https://bugzilla.redhat.com/show_bug.cgi?id=1548358 Hold until upstream merge. @derekwaynecarr @vikaschoudhary16
openshift · Mar 8, 2018 · 032dbc6 · 032dbc6
2 parents ff1a11f + f42436d
commit 032dbc6
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