Commit cb7a542

openshift-merge-robot

authored

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

2 parents 60c4264 + 9bf708a commit cb7a542Copy full SHA for cb7a542

1 file changed

+6

-1

lines changed

vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd
- apply_systemd.go

1 file changed

+6

-1

lines changed

`‎vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go`

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)