Skip to content

zh-trans: merge release-1.14 into release-1.16#16755

Merged
markthink merged 133 commits intokubernetes:release-1.16from
SataQiu:shida-release-1.16
Oct 10, 2019
Merged

zh-trans: merge release-1.14 into release-1.16#16755
markthink merged 133 commits intokubernetes:release-1.16from
SataQiu:shida-release-1.16

Conversation

@SataQiu
Copy link
Copy Markdown
Member

@SataQiu SataQiu commented Oct 9, 2019

zh-trans: merge release-1.14 into release-1.16
/cc @chenrui333 @markthink @zhangxiaoyu-zidif @tengqm

SataQiu and others added 30 commits October 9, 2019 15:21
…#14419)

* Add website/content/zh/docs/reference/glossary/sysctl.md. Update sysctl.md

* Modified format

* Add website/content/zh/docs/reference/glossary/sysctl.md.

* Update format

* Update sysctl.md
…ollers.md (kubernetes#14443)

Update content/zh/docs/reference/access-authn-authz/extensible-admission-controllers.md

Co-Authored-By: SataQiu <1527062125@qq.com>

Apply suggestions from code review

Co-Authored-By: SataQiu <1527062125@qq.com>

zh-trans:content/zh/docs/reference/access-authn-authz/admission-controllers.md
…nit_phase_mark-control-plane.md in zh doc. (kubernetes#14456)

* Add kubeadm_init_phase_mark-control-plane.md

* Add kubeadm_init_phase_kubeconfig_controller-manager.md

* Update err.

* fix error

* Fix error.
)

Signed-off-by: André Martins <aanm90@gmail.com>
* update Manage HugePages

* Update scheduling-hugepages.md

* Update scheduling-hugepages.md

* Update scheduling-hugepages.md

* Update scheduling-hugepages.md

* Update scheduling-hugepages.md
….html (kubernetes#14877)

* Fix syntax.

* Fix difference.

* Create content/zh/docs/tutorials/kubernetes-basics/explore/explore-intro.html

* Fix missing.

* Fix syntax error.

* Fix Node-工作节点.
…md (kubernetes#14937)

* zh-trans: add /content/zh/docs/tasks/administer-cluster/kms-provider.md

* Update content/zh/docs/tasks/administer-cluster/kms-provider.md

Co-Authored-By: chenrui <rui@meetup.com>
kubernetes#14979)

* update sample code in run-single-instance-stateful-application.md

* Update translation

* fix

* Update document format

* fix code style

* fix yaml format
…kubernetes#14934)

* zh-trans: add /content/zh/docs/tasks/administer-cluster/namespaces.md

* 补充缺失文件
kubernetes#14931)

* zh-trans: add /content/zh/docs/tasks/administer-cluster/namespaces-walkthrough.md

* 补充缺失文件

* Update content/zh/docs/tasks/administer-cluster/namespaces-walkthrough.md

Co-Authored-By: chenrui <rui@meetup.com>

* Update content/zh/docs/tasks/administer-cluster/namespaces-walkthrough.md

Co-Authored-By: chenrui <rui@meetup.com>

* update glossary
…netes#15084)

* Fix CoreDNS version restriction for service ExternalName type.

before: This requires version 1.7 or higher of `kube-dns`.
after: You need CoreDNS version 1.7 or higher to use the `ExternalName` type.

* Update content/zh/docs/concepts/services-networking/service.md

Thanks.

Co-Authored-By: SataQiu <1527062125@qq.com>
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 9, 2019
Copy link
Copy Markdown

@markthink markthink left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 9, 2019
@chenrui333
Copy link
Copy Markdown
Member

/lgtm
/approve

@chenrui333
Copy link
Copy Markdown
Member

@cody-clark can you approve this? Thanks

/assign @cody-clark

@SataQiu
Copy link
Copy Markdown
Member Author

SataQiu commented Oct 10, 2019

/assign @tengqm

@xichengliudui
Copy link
Copy Markdown
Contributor

/approve

@markthink markthink self-requested a review October 10, 2019 05:46
@markthink
Copy link
Copy Markdown

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: chenrui333, markthink, xichengliudui
To complete the pull request process, please assign cody-clark
You can assign the PR to them by writing /assign @cody-clark in a comment when ready.

The full list of commands accepted by this bot can be found here.

Details 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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.