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

[zh-cn] Fix some links and translation in scheduling-eviction #35045

Merged
merged 4 commits into from
Jul 19, 2022
Merged

[zh-cn] Fix some links and translation in scheduling-eviction #35045

merged 4 commits into from
Jul 19, 2022

Conversation

zqzten
Copy link
Member

@zqzten zqzten commented Jul 15, 2022

This PR fixes some links and a translation problem in scheduling-eviction section of zh-cn doc.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jul 15, 2022
@netlify
Copy link

netlify bot commented Jul 15, 2022 •
edited
Loading

✅ Pull request preview available for checking

Built without sensitive environment variables

Name Link
🔨 Latest commit cb891e4
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/62d4d24afa40a2000ae8bbe9
😎 Deploy Preview https://deploy-preview-35045--kubernetes-io-main-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@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 Jul 16, 2022
@zqzten zqzten requested a review from tengqm July 16, 2022 03:48
@tengqm
Copy link
Contributor

tengqm commented Jul 17, 2022

/label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot added tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 17, 2022
@tengqm
Copy link
Contributor

tengqm commented Jul 17, 2022

This PR has some conflicts to be resolved, @zqzten

@zqzten zqzten force-pushed the fix-zh-scheduling-eviction branch from 2cf79d6 to cb891e4 Compare July 18, 2022 03:23
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2022
@zqzten
Copy link
Member Author

zqzten commented Jul 18, 2022

Rebased, thanks for the reminder @tengqm

@howieyuen
Copy link
Member

I though 4 commits are one-on-one with 4 files, truth is not.
You may squash commits and push with -f flag.

@zqzten
Copy link
Member Author

zqzten commented Jul 18, 2022

You may squash commits and push with -f flag.

This PR already has a tide/merge-method-squash label so it seems no need to do this :)

@tengqm
Copy link
Contributor

tengqm commented Jul 18, 2022

/approve
Assuming that all files were still in sync with English version.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

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 Jul 18, 2022
@howieyuen
Copy link
Member

You may squash commits and push with -f flag.

This PR already has a tide/merge-method-squash label so it seems no need to do this :)

yeah, it's a good habit to keep 😄

@howieyuen
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 19, 2022
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 10cb4f07752e4276a3034091fdffdf27db0b064c

@k8s-ci-robot k8s-ci-robot merged commit ccf5bce into kubernetes:main Jul 19, 2022
@zqzten zqzten deleted the fix-zh-scheduling-eviction branch July 19, 2022 11:47
mimowo pushed a commit to mimowo/website that referenced this pull request Jul 27, 2022
@zqzten @mimowo
[zh-cn] Fix some links and translation in scheduling-eviction (kubern…
23cd1f7 
…etes#35045)

* [zh-cn] fix some links in scheduling-eviction

* [zh-cn] fix translation in  pod-priority-preemption

* [zh-cn] add missing pod-disruption glossary definition in scheduling-eviction index

* [zh-cn] add missing original English text in comments of scheduling-eviction index
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@howieyuen howieyuen Awaiting requested review from howieyuen

@idealhack idealhack Awaiting requested review from idealhack

@tengqm tengqm Awaiting requested review from tengqm

Assignees

@howieyuen howieyuen

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zqzten @tengqm @howieyuen @k8s-ci-robot