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

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
@jiaj12
Update service-topology.md
9d6c1af 
[zh] update content to match en master
@guzj11
Update namespaces.md
fcef54f 
update the unnumbered format
@jiaj12
Update persistent-volumes.md
fa4f27b 
[zh] update content to match en master
@jiaj12
Update storage-capacity.md
39c6521 
[zh] remove broken link to CSIStorageCapacity in API reference
@k8s-ci-robot
Merge pull request #25674 from jiaj12/patch-68
cb074fe 
Update connect-applications-service.md
@yuandongx
Update tools.md
4bb4113
@k8s-ci-robot
Merge pull request #25678 from guzj11/patch-47
d338c04 
Update namespaces.md
@k8s-ci-robot
Merge pull request #25624 from Cweiping/feature/add_note_port_forward
839873d 
add note to kubectl port-forward
@Sophy417
Create 2015-11-00-Kubernetes-1-1-Performance-Upgrades-Improved-Toolin…
b7fbfd3 
…g-And-A-Growing-Community.md
@jiaj12
Update volume-snapshots.md
5030229 
[zh] update content to match en master
@k8s-ci-robot
Merge pull request #25681 from yuandongx/patch-1
a2b7067 
[zh]Update tools.md
@k8s-ci-robot
Merge pull request #25680 from jiaj12/patch-72
93b2b7d 
Update storage-capacity.md
@CooperLi
Update debug-application.md
d2bf360 
Fix typo
@k8s-ci-robot
Merge pull request #25625 from Sophy417/patch-34
8227d2f 
Create 2016-05-00-Coreosfest2016-Kubernetes-Community.md
@k8s-ci-robot
Merge pull request #25585 from guzj11/patch-24
cf11199 
Update configure-projected-volume-storage.md
@k8s-ci-robot
Merge pull request #25566 from howieyuen/create-cluster-kubeadm
98f0a88 
[zh] kubeadm: remove general output from "kubeadm init"
@k8s-ci-robot
Merge pull request #25540 from guzj11/patch-15
fcb75a2 
Update adding-windows-nodes.md
@k8s-ci-robot
Merge pull request #25448 from jiaj12/patch-49
13561ab 
Update index.md
@k8s-ci-robot
Merge pull request #25420 from jiaj12/patch-36
d4121d4 
Update manual-rotation-of-ca-certificates.md
@k8s-ci-robot
Merge pull request #25423 from jiaj12/patch-39
37f46ed 
Update node-conformance.md
@k8s-ci-robot
Merge pull request #25584 from guzj11/patch-21
d346150 
Update configure-persistent-volume-storage.md
@k8s-ci-robot
Merge pull request #25603 from guzj11/patch-31
255fe9e 
Update declarative-config.md
@guzj11
Update safely-drain-node.md
88dae31 
sync with English version
@php-coder
chore(content/ru/main_index.temp.txt): delete unused temporary file
f93a709
@php-coder
chore(content/ru/setup.temp.txt): delete unused temporary file
3b0c798
@k8s-ci-robot
Merge pull request #25692 from php-coder/patch-1
f61f860 
Remove unused temporary files
@pnosov
Fix typo in manage-resources-containers.md
815fe37
@k8s-ci-robot
Merge pull request #25666 from wangxy518/patch-12
9300ed5 
Update _index.html
@kbarnard10
Update index.md
3b6584c
@k8s-ci-robot
Merge pull request #25693 from pnosov/patch-1
d3456e0 
Fixed a typo in manage-resources-containers.md
ydFu and others added 3 commits January 5, 2021 11:58
@ydFu
Add Code blocks in limit-storage-consumption.md
8d50a4c 
* Add Code blocks in the Markdown spec to make it easy to read.

Signed-off-by: ydFu <[email protected]>
@k8s-ci-robot
Merge pull request #25948 from ydFu/add-code-blocks
34b84f9 
Add Code blocks in limit-storage-consumption.md
@reylejano
Merge remote-tracking branch 'upstream/master' into dev-1.21
afc46b4
@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 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 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

irvifa
irvifa reviewed Jan 5, 2021
View reviewed changes
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
Reviewers

@irvifa irvifa irvifa left review comments

@annajung annajung Awaiting requested review from annajung

@ahmetb ahmetb Awaiting requested review from ahmetb

@cdrage cdrage Awaiting requested review from cdrage

Assignees

@annajung annajung

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
Milestone
1.21
Development

Successfully merging this pull request may close these issues.