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

UPSTREAM: opencontainers/runc: 1754: Add timeout while waiting for StartTransinetUnit completion signal #18876

Merged
merged 1 commit into from Mar 8, 2018

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
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Mar 7, 2018
@bparees bparees removed their request for review March 7, 2018 15:31
@sjenning
Copy link
Contributor Author

sjenning commented Mar 7, 2018

/retest

@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 sjenning changed the title UPSTREAM: 1754: Add timeout while waiting for StartTransinetUnit completion signal 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 added a commit that referenced this pull request Mar 8, 2018
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-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 18778, 18709, 18876, 18897, 18652).

@openshift-merge-robot openshift-merge-robot merged commit 032dbc6 into openshift:master 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.

None yet

4 participants