Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.9] UPSTREAM: opencontainers/runc: 1754: Add timeout while waiting for StartTransinetUnit completion signal #18877

Merged

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning commented Mar 7, 2018

@sjenning sjenning added kind/bug Categorizes issue or PR as related to a bug. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 7, 2018
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 7, 2018
@sjenning sjenning changed the title UPSTREAM: 1754: Add timeout while waiting for StartTransinetUnit completion signal [3.9] UPSTREAM: 1754: Add timeout while waiting for StartTransinetUnit completion signal Mar 7, 2018
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Mar 7, 2018
@eparis eparis added this to the v3.9 milestone Mar 7, 2018
@sjenning
Copy link
Contributor Author

sjenning commented Mar 7, 2018

/retest

@mrunalp
Copy link
Member

mrunalp commented Mar 8, 2018

Merged upstream.

@sjenning sjenning removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 8, 2018
@sjenning
Copy link
Contributor Author

sjenning commented Mar 8, 2018

/retest

@sjenning sjenning force-pushed the pick-runc-1754-3.9 branch from 0fbe48c to 9bf708a Compare March 8, 2018 14:16
@sjenning sjenning changed the title [3.9] UPSTREAM: 1754: Add timeout while waiting for StartTransinetUnit completion signal [3.9] UPSTREAM: opencontainers/runc: 1754: Add timeout while waiting for StartTransinetUnit completion signal Mar 8, 2018
@derekwaynecarr
Copy link
Member

/approve
/lgtm

prevents a potential race condition that could have wedged the kubelet on start-up.

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, sjenning

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 8, 2018
@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit cb7a542 into openshift:release-3.9 Mar 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants