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

Rebase 1.11 on master -- do not merge #8551

Closed
wants to merge 3 commits into from
Closed

Rebase 1.11 on master -- do not merge #8551

wants to merge 3 commits into from

Conversation

mdlinville
Copy link
Contributor

Rebase 1.11 on master after Hugo migration. Involved rebasing already-merged PRs #8144 and #8211

This PR is for review and Netlify only -- I believe this will need to be force-pushed. Ignore the number of commits it thinks are in it.

/assign @chenopis @Bradamant3
/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 15, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 15, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-vnext-staging ready!

Built with commit 67f71e1

https://deploy-preview-8551--kubernetes-io-vnext-staging.netlify.com

@mdlinville mdlinville changed the base branch from release-1.11 to master May 15, 2018 20:50
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 15, 2018
@mdlinville
Copy link
Contributor Author

mdlinville commented May 15, 2018 •
edited
Loading

The PRs here change the following pages:

https://deploy-preview-8551--kubernetes-io-master-staging.netlify.com/docs/concepts/architecture/nodes/

https://deploy-preview-8551--kubernetes-io-master-staging.netlify.com/docs/concepts/configuration/pod-priority-preemption/#how-to-disable-preemption

Before I force-push (when I have rights) I want to figure out how to update the drop-down and do that.

resouer and others added 3 commits May 15, 2018 14:09
@resouer
Seperate priority and preemption (#8144)
4bf475e
@k82cn
Doc about PID pressure condition. (#8211)
dcf5cf2 
* Doc about PID pressure condition.

Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>

* "so" -> "too"
Update version selector for 1.11
6cba902
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: bradamant3

Assign the PR to them by writing /assign @bradamant3 in a comment when ready.

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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 15, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 6cba902

https://deploy-preview-8551--kubernetes-io-master-staging.netlify.com

@Bradamant3
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 15, 2018
@chenopis
Copy link
Contributor

chenopis commented May 15, 2018 •
edited
Loading

Is this still supposed to be do-not-merge/hold?

@mdlinville
Copy link
Contributor Author

Correct, this was just for review. I just did the force-push.

@mdlinville mdlinville closed this May 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bradtopol bradtopol Awaiting requested review from bradtopol

@tengqm tengqm Awaiting requested review from tengqm

Assignees

@Bradamant3 Bradamant3

@chenopis chenopis

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mdlinville @k8sio-netlify-preview-bot @k8s-ci-robot @Bradamant3 @chenopis @resouer @k82cn