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.

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

Merged master dev 1.21 - 1/5/21 #25964

Merged
merged 469 commits into from
Jan 5, 2021
Merged

Merged master dev 1.21 - 1/5/21 #25964

merged 469 commits into from
Jan 5, 2021

Conversation

reylejano
Copy link
Member

Merge master into dev-1.21 to keep in sync - SIG-Release 1.21 Docs team 1/5/21

jiaj12 and others added 30 commits December 17, 2020 15:43
[zh] update content to match en master
update the unnumbered format
[zh] update content to match en master
[zh] remove broken link to CSIStorageCapacity in API reference
Update connect-applications-service.md
[zh] update content to match en master
Update storage-capacity.md
Create 2016-05-00-Coreosfest2016-Kubernetes-Community.md
Update configure-projected-volume-storage.md
[zh] kubeadm: remove general output from "kubeadm init"
Update adding-windows-nodes.md
Update manual-rotation-of-ca-certificates.md
Update node-conformance.md
Update configure-persistent-volume-storage.md
Update declarative-config.md
sync with English version
Remove unused temporary files
Fixed a typo in manage-resources-containers.md
ydFu and others added 3 commits January 5, 2021 11:58
* Add Code blocks in the Markdown spec to make it easy to read.

Signed-off-by: ydFu <[email protected]>
Add Code blocks in limit-storage-consumption.md
@k8s-ci-robot k8s-ci-robot added this to the 1.21 milestone Jan 5, 2021
@k8sio-netlify-preview-bot
Copy link
Collaborator

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

🔨 Explore the source changes: afc46b4

🔍 Inspect the deploy logs: https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5ff48b1a0de2fa00082fab55

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 5, 2021
@reylejano
Copy link
Member Author

/cc @annajung

@k8s-ci-robot k8s-ci-robot requested a review from annajung January 5, 2021 15:52
@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/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/ru Issues or PRs related to Russian language language/zh Issues or PRs related to Chinese language labels Jan 5, 2021
@k8s-ci-robot k8s-ci-robot requested review from ahmetb and cdrage January 5, 2021 15:52
@k8s-ci-robot k8s-ci-robot added 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. labels Jan 5, 2021
@annajung
Copy link
Contributor

annajung commented Jan 5, 2021

No build errors
/lgtm

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

LGTM label has been added.

Git tree hash: 9bfc9da20e680173f183aec93a9d37755eeb50a5

Copy link
Member

@irvifa irvifa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: irvifa

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 Jan 5, 2021
@k8s-ci-robot k8s-ci-robot merged commit ba1020e into kubernetes:dev-1.21 Jan 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. 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/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/ru Issues or PRs related to Russian language 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.