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

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

Merged
merged 133 commits into from Oct 10, 2019

Conversation

@SataQiu
Copy link
Member

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 May 5, 2019
* 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 (#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. (#14456)

* Add kubeadm_init_phase_mark-control-plane.md

* Add kubeadm_init_phase_kubeconfig_controller-manager.md

* Update err.

* fix error

* Fix error.
)

* .

* Add files via upload
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
…/deploy-interactive.html
….html (#14877)

* Fix syntax.

* Fix difference.

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

* Fix missing.

* Fix syntax error.

* Fix Node-工作节点.
…md (#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>
#14979)

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

* Update translation

* fix

* Update document format

* fix code style

* fix yaml format
…#14934)

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

* 补充缺失文件
* .

* .

* .

* .

* .

* .
#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
* 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>
Copy link
Member

left a comment

/lgtm
/approve

@chenrui333

This comment has been minimized.

Copy link
Member

commented Oct 9, 2019

/lgtm
/approve

@chenrui333

This comment has been minimized.

Copy link
Member

commented Oct 9, 2019

@cody-clark can you approve this? Thanks

/assign @cody-clark

@SataQiu

This comment has been minimized.

Copy link
Member Author

commented Oct 10, 2019

/assign @tengqm

@xichengliudui

This comment has been minimized.

Copy link
Contributor

commented Oct 10, 2019

/approve

@markthink markthink self-requested a review Oct 10, 2019
@markthink

This comment has been minimized.

Copy link
Member

commented Oct 10, 2019

/approve

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Oct 10, 2019

[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.

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

@markthink markthink merged commit c2a56a8 into kubernetes:release-1.16 Oct 10, 2019
5 of 7 checks passed
5 of 7 checks passed
tide Not mergeable. Needs approved label.
Details
Pages changed 2672 new files uploaded
Details
Header rules 1 header rule processed
Details
Mixed content No mixed content detected
Details
Redirect rules 1 redirect rule processed
Details
cla/linuxfoundation SataQiu authorized
Details
deploy/netlify Deploy preview ready!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.