Skip to content

UPSTREAM: 63416: Retry certificate approval on conflict errors#19770

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
liggitt:csr-conflict
May 21, 2018
Merged

UPSTREAM: 63416: Retry certificate approval on conflict errors#19770
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
liggitt:csr-conflict

Conversation

@liggitt
Copy link
Contributor

@liggitt liggitt commented May 18, 2018

Fixes #19430

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 18, 2018
@liggitt
Copy link
Contributor Author

liggitt commented May 18, 2018

/assign @smarterclayton

@liggitt
Copy link
Contributor Author

liggitt commented May 18, 2018

cc @sdodson

@bparees bparees removed their request for review May 18, 2018 16:22
@smarterclayton
Copy link
Contributor

Uh oh

@smarterclayton
Copy link
Contributor

Upstream is missing a break.

@smarterclayton
Copy link
Contributor

No, upstream has the break. Downstream missing it?

@liggitt
Copy link
Contributor Author

liggitt commented May 18, 2018

Pick wasn't clean. I missed it.

@smarterclayton
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, smarterclayton

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

The pull request process is described here

Details 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-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 848b262 into openshift:master May 21, 2018
@liggitt liggitt deleted the csr-conflict branch May 22, 2018 13:23
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants