Skip to content

UPSTREAM: 57854: fix bug of swallowing missing merge key error #18331

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jan 31, 2018
Merged

UPSTREAM: 57854: fix bug of swallowing missing merge key error #18331

merged 1 commit into from
Jan 31, 2018

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Jan 29, 2018

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2018
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 29, 2018
@mfojtik
Copy link
Contributor Author

mfojtik commented Jan 29, 2018

@juanvallejo FYI

@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Jan 29, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mfojtik

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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 29, 2018
@mfojtik
Copy link
Contributor Author

mfojtik commented Jan 29, 2018

@juanvallejo that unit test failure does not look good, can you double check?

@juanvallejo
Copy link
Contributor

@mfojtik looking

@juanvallejo
Copy link
Contributor

/test gcp

@mfojtik
Copy link
Contributor Author

mfojtik commented Jan 30, 2018

/retest

@mfojtik mfojtik added the lgtm Indicates that a PR is ready to be merged. label Jan 30, 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 (batch tested with PRs 18225, 18351, 18331, 18340, 18326).

@openshift-merge-robot openshift-merge-robot merged commit db03c49 into openshift:master Jan 31, 2018
@mfojtik mfojtik deleted the pick-57854 branch September 5, 2018 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k Awaiting requested review from deads2k

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

1 more reviewer

@juanvallejo juanvallejo juanvallejo approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
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/M Denotes a PR that changes 30-99 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mfojtik @openshift-ci-robot @juanvallejo @openshift-merge-robot