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.16-temporary to release-1.17 #18230

Conversation

@xichengliudui
Copy link
Contributor

xichengliudui commented Dec 21, 2019

zhangx501 and others added 30 commits Oct 15, 2019
Signed-off-by: Yixiang2019 <wang.yixiang@zte.com.cn>
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
…#16951)

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
* zh-trans:/docs/concepts/workloads/pods/disruptions.md

* Update content/zh/docs/concepts/workloads/pods/disruptions.md

Co-Authored-By: Qiming <tengqim@cn.ibm.com>
…ference/kube-scheduler.md (#17006)
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

Update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update the style

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
…_alpha_kubelet_config_download.md (#17037)
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
…ubeadm_token_generate.md (#17049)
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
zhangx501 and others added 8 commits Dec 6, 2019
* Create imperative-config.md

* Update imperative-config.md
* Update config.toml(release-1.16) for 1.17

* Update config.toml

* Remove ru language
@xichengliudui xichengliudui changed the title Merge release-1.16-temporary to release-1.17 ZH-trans: merge release-1.16-temporary to release-1.17 Dec 21, 2019
@chenrui333

This comment has been minimized.

Copy link
Member

chenrui333 commented Dec 22, 2019

Should be good by just adding content/zh/examples/controllers/nginx-deployment.yaml

9:45:21 AM: Error: Error building site: "/opt/build/repo/content/zh/docs/concepts/workloads/controllers/deployment.md:22:1": failed to render shortcode "capture": failed to process shortcode: "/opt/build/repo/layouts/shortcodes/codenew.html:14:16": execute of template failed: template: shortcodes/codenew.html:14:16: executing "shortcodes/codenew.html" at <readFile $filename>: error calling readFile: file "content/zh/examples/controllers/nginx-deployment.yaml" does not exist
9:45:21 AM: Function Dir: /opt/build/repo/functions
9:45:21 AM: Skipping functions preparation step: /opt/build/repo/functions not found
@sftim

This comment has been minimized.

Copy link
Contributor

sftim commented Dec 23, 2019

Should this change actually target the master branch? That's what most localizations seem to merge into when finishing a milestone.

@xichengliudui

This comment has been minimized.

Copy link
Contributor Author

xichengliudui commented Dec 24, 2019

Should this change actually target the master branch? That's what most localizations seem to merge into when finishing a milestone.

master #18217
release-1.16 #18216

@markthink

This comment has been minimized.

Copy link
Member

markthink commented Dec 25, 2019

/lgtm
/approve

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Dec 25, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markthink

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 merged commit 2e622fc into kubernetes:release-1.17 Dec 25, 2019
6 of 7 checks passed
6 of 7 checks passed
tide Not mergeable.
Details
Pages changed 2818 new files uploaded
Details
Header rules 1 header rule processed
Details
Mixed content No mixed content detected
Details
Redirect rules 510 redirect rules processed
Details
cla/linuxfoundation xichengliudui authorized
Details
deploy/netlify Deploy preview ready!
Details
Copy link
Member

chenrui333 left a comment

Thanks for doing this!!

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.