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

[WIP] Repair dev.1-18 round 2 #19235

Closed
wants to merge 0 commits into from
Closed

[WIP] Repair dev.1-18 round 2 #19235

wants to merge 0 commits into from

Conversation

zacharysarah
Copy link
Contributor

@zacharysarah zacharysarah commented Feb 21, 2020 •
edited
Loading

This PR replicates #19221.

This PR is necessary because #19221 and #19117 were merged manually instead of with Prow. The manual merge applied the default repo merge strategy of squash. Sync PRs must merge with the merge method.

Note that #19221 had the tide/merge-method-merge label applied, but the manual merge overrode the tide label.

For more information about why the merge method matters, see kubernetes/test-infra#13065 (comment).

Effect on open PRs

When this PR merges, all open PRs based on dev-1.18 will probably need to rebase.

Double check the merge strategy

  1. Make sure this PR has the label tide/merge-method-merge. 👉

  2. Do not merge this PR manually. Merge this PR via Prow with /lgtm and /approve.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 21, 2020
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Feb 21, 2020 •
edited
Loading

Deploy preview for kubernetes-io-vnext-staging processing.

Building with commit 6ff38e0

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5e5070be5fe09b0009853dee

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 21, 2020
@k8s-ci-robot k8s-ci-robot added area/blog Issues or PRs related to the Kubernetes Blog subproject language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/id Issues or PRs related to Indonesian language language/it Issues or PRs related to Italian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pl Issues or PRs related to Polish language language/ru Issues or PRs related to Russian language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 21, 2020
@zacharysarah zacharysarah added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Feb 21, 2020
@zacharysarah zacharysarah changed the title [WIP] Repair dev.1 18 round 2 [WIP] Repair dev.1-18 round 2 Feb 21, 2020
@zacharysarah zacharysarah mentioned this pull request Feb 21, 2020
Closed
@zacharysarah zacharysarah force-pushed the repair-dev.1-18-round-2-fight branch from 62e9b5e to 6ff38e0 Compare February 22, 2020 00:07
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 22, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 22, 2020
@zacharysarah zacharysarah removed the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Feb 22, 2020
@zacharysarah zacharysarah added tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. and removed tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges. labels Feb 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bene2k1 bene2k1 Awaiting requested review from bene2k1

@bprashanth bprashanth Awaiting requested review from bprashanth

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/blog Issues or PRs related to the Kubernetes Blog subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/id Issues or PRs related to Indonesian language language/it Issues or PRs related to Italian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pl Issues or PRs related to Polish language language/ru Issues or PRs related to Russian language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zacharysarah @k8sio-netlify-preview-bot @k8s-ci-robot