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: opencontainer/runc: 1651: systemd: adjust CPUQuotaPerSecUSec to compensate for systemd internal handling #17348

Merged
merged 1 commit into from
Dec 17, 2017

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 16, 2017
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Nov 16, 2017
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 16, 2017
@derekwaynecarr
Copy link
Member

hold pending rebase landing

@sjenning
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2017
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2017
openshift-merge-robot added a commit that referenced this pull request Nov 21, 2017
Automatic merge from submit-queue.

[3.7] UPSTREAM: opencontainer/runc: 1651: systemd: adjust CPUQuotaPerSecUSec to compensate for systemd internal handling

master PR #17348

@derekwaynecarr @mrunalp @jupierce
@sjenning
Copy link
Contributor Author

/retest

@sjenning sjenning removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 21, 2017
…ec to compensate for systemd internal handling
@sjenning
Copy link
Contributor Author

/retest

@sjenning
Copy link
Contributor Author

sjenning commented Dec 15, 2017

@derekwaynecarr can I get lgtm/approve on this. The 3.6 and 3.7 picks have already merged and this fell off the truck and is still causing issues. Might need to pick to 3.8 now that it has branched as well.

@derekwaynecarr
Copy link
Member

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 15, 2017
@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.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your 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 Dec 15, 2017
@sjenning
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 6912595 into openshift:master Dec 17, 2017
openshift-merge-robot added a commit that referenced this pull request Jan 5, 2018
Automatic merge from submit-queue.

[3.8] UPSTREAM: opencontainers/runc: 1651: systemd: adjust CPUQuotaPerSecUSec to compensate for systemd internal handling

opencontainers/runc#1651

master PR: #17348

@derekwaynecarr @mrunalp @jupierce @eparis @smarterclayton
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. 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.

5 participants