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.

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

Revert "Merge pull request #18554 from rootfs/pr-58177" #18849

Merged
merged 1 commit into from
Mar 8, 2018
Merged

Revert "Merge pull request #18554 from rootfs/pr-58177" #18849

merged 1 commit into from
Mar 8, 2018

Conversation

gnufied
Copy link
Member

@gnufied gnufied commented Mar 5, 2018 •
edited
Loading

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 5, 2018
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Mar 5, 2018
@eparis
Copy link
Member

eparis commented Mar 5, 2018

/approve
/hold

I'm approving, to short circuit any process issues. I expect the deep reviewer to remove the hold if this is ready to merge.

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 5, 2018
@gnufied
Copy link
Member Author

gnufied commented Mar 5, 2018

I have verified this manually that, it indeed fixes aformentioned regression and it should be good to merge.

@jsafrane
Copy link
Contributor

jsafrane commented Mar 6, 2018

/retest

@jsafrane
Copy link
Contributor

jsafrane commented Mar 6, 2018

@rootfs

The following commits contain Godeps changes but aren't declared as UPSTREAM:
[3f52dd04a] Revert "Merge pull request #18554 from rootfs/pr-58177"

@jsafrane
Copy link
Contributor

jsafrane commented Mar 6, 2018

sorry, that should be @gnufied

@gnufied gnufied force-pushed the revert-reconstruct-pr branch 3 times, most recently from 0fd1f88 to 06db1cb Compare March 6, 2018 15:14
@openshift-ci-robot openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 6, 2018
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 6, 2018
@jsafrane
Copy link
Contributor

jsafrane commented Mar 6, 2018

/lgtm

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

gnufied commented Mar 6, 2018

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 6, 2018
@gnufied
UPSTREAM: <drop>: Revert "Merge pull request openshift#18554 from roo…
fdafb1e 
…tfs/pr-58177"

This reverts commit 8fd1640, reversing
changes made to 3522daf.
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2018
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 6, 2018 •
edited
Loading

@gnufied: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_clusterup 06db1cb link /test extended_clusterup
ci/openshift-jenkins/extended_image_ecosystem 06db1cb link /test extended_image_ecosystem

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@jsafrane
Copy link
Contributor

jsafrane commented Mar 6, 2018

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eparis, gnufied, jsafrane

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

/retest

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

@eparis eparis added the kind/bug Categorizes issue or PR as related to a bug. label Mar 7, 2018
@eparis eparis added this to the 3.9.0 milestone Mar 7, 2018
@eparis eparis modified the milestones: v3.9, 3.7.0 Mar 7, 2018
@eparis eparis removed the queue/fix label Mar 7, 2018
@eparis eparis merged commit 804ba0b 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
Reviewers

@jsafrane jsafrane Awaiting requested review from jsafrane

@rootfs rootfs Awaiting requested review from rootfs

Assignees

@jsafrane jsafrane

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
v3.9
Development

Successfully merging this pull request may close these issues.
6 participants
@gnufied @eparis @jsafrane @openshift-ci-robot @openshift-bot @openshift-merge-robot