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.12 into release-1.14 #14143

Merged
merged 627 commits into from May 5, 2019

Conversation

@SataQiu
Copy link
Member

commented May 3, 2019

AdamDang and others added some commits Dec 22, 2018

zh-trans: add setup-tools/kubeadm/kubeadm-reset.md&kubeadm-version.md (
…#11780)

* zh-trans: add /zh/docs/reference/setup-tools/kubeadm/kubeadm-reset.md

zh-trans: add /zh/docs/reference/setup-tools/kubeadm/kubeadm-reset.md

* zh-trans: add zh/docs/reference/setup-tools/kubeadm/kubeadm-version.md

zh-trans: add zh/docs/reference/setup-tools/kubeadm/kubeadm-version.md

* Update kubeadm-reset.md

* Create kubeadm_reset.md

* Create kubeadm_version.md

* Delete kubeadm_version.md

* Create kubeadm_version.md

* Update kubeadm_reset.md

* Update kubeadm_reset.md
ZH-trans: Update http-proxy-access-api.md (#11865)
* ZH-trans: Update http-proxy-access-api.md

* Update http-proxy-access-api.md
ZH-trans: Update coarse-parallel-processing-work-queue.md (#11862)
* ZH-trans: Update coarse-parallel-processing-work-queue.md

* Update coarse-parallel-processing-work-queue.md
zh-trans: add /docs/concepts/architecture/cloud-controller.md (#11799)
* docs/concepts/architecture/cloud-controller.md

* docs/concepts/architecture/cloud-controller.md

* docs/concepts/architecture/cloud-controller.md

* fix

* fix

* fix
zh-trans: /docs/contribute/style/kubernetes-components.md (#11838)
Signed-off-by: liyuan198251 <li.yuan4@zte.com.cn>

zh-trans: /docs/contribute/generate-ref-docs/kubernetes-components.md; update

Signed-off-by: liyuan198251 <li.yuan4@zte.com.cn>
ZH-trans: add Update define-environment-variable-container.md (#11859)
* Update define-environment-variable-container.md

* Update define-environment-variable-container.md

* Update define-environment-variable-container.md

* Update define-environment-variable-container.md

* Update define-environment-variable-container.md
Update fine-parallel-processing-work-queue.md (#11863)
* Update fine-parallel-processing-work-queue.md

* Update fine-parallel-processing-work-queue.md
zh-trans: add / docs/reference/setup-tools/kubeadm/kubeadm-join.md (#…
…11798)

* zh-trans: add / docs/reference/setup-tools/kubeadm/kubeadm-join.md

zh-trans: add / docs/reference/setup-tools/kubeadm/kubeadm-join.md

* Update kubeadm-join.md

* Create kubeadm_join.md
zh-trans: update docs/concepts/containers/images.md (#11877)
* zh-trans: update docs/concepts/containers/images.md

* zh-trans: update docs/concepts/containers/images.md
zh_trans: kubeadm_token_generate.md (#11884)
* zh_trans: kubeadm_token_generate.md

zh_trans: /docs/reference/setup-tools/kubeadm/generated/kubeadm_token_generate.md

* Better translation  

Better translation
 
zh-trans: add /docs/tasks/configure-pod-container/configure-pod-initi…
…alization.md (#11886)

zh-trans: add /docs/tasks/configure-pod-container/configure-pod-initialization.md
zh_trans: kubeadm_token_delete.md (#11883)
* zh_trans: kubeadm_token_delete.md

zh_trans: /docs/reference/setup-tools/kubeadm/generated/kubeadm_token_create.md

* fix tpye error

fix tpye error

*  Better translation  

Better translation
zh_trans: independent/create-cluster-kubeadm.md (#11882)
* zh_trans: independent/create-cluster-kubeadm.md

zh_trans: docs/setup/independent/create-cluster-kubeadm.md

* fix word style error

* fix type error

* better zhtran

better zhtran

* fix "Create" -> "create"

fix "Create" -> "create"
zh-trans: add docs⁩/concept⁨s/storage/storage-classes.md (#11788)
* ZH-trans: fixing formatting errors (#11661)

* ZH-trans: fixing formatting errors

* Update ZH-trans: fixing formatting errors

storage-classes zh part 1

* storage-classes zh trans

* fix typo

update trans for provisioner & fix typo

* fix typo

* 根据校对更新翻译
zh_trans: kubeadm-token.md (#11898)
zh_trans: /docs/reference/setup-tools/kubeadm/kubeadm-token.md
Merge pull request #11801 from zhangqx2010/1.12-web-ui-dashboard
zh-trans: add /docs/tasks/access-application-cluster/web-ui-dashboard.md
zh-trans: add /docs/tasks/configure-pod-container/quality-service-pod…
….md (#11900)

* zh-trans: add /docs/tasks/configure-pod-container/quality-service-pod.md

zh-trans: add /docs/tasks/configure-pod-container/quality-service-pod.md

* Update quality-service-pod.md
zh_trans: kubeadm_alpha_phase_bootstrap-token_node.md (#11897)
zh_trans: Path:/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_bootstrap-token_node.md
zh-trans: add /docs/concepts/storage/volumes.md (#11767)
* zh-trans: add /docs/concepts/storage/volumes.md

zh-trans: add /docs/concepts/storage/volumes.md

* Update volumes.md

* Update volumes.md

* self-review

* Update volumes.md
zh-trans: /docs/reference/glossary/approver.md (#11924)
zh-trans: /docs/reference/glossary/approver.md

@SataQiu SataQiu changed the title zh-trans: merge release-1.12 into release 1.14 zh-trans: merge release-1.12 into release-1.14 May 3, 2019

@tengqm

This comment has been minimized.

Copy link
Contributor

commented May 4, 2019

@SataQiu This is a big job. Many thanks for working on this.
/lgtm

@markthink

This comment has been minimized.

Copy link
Member

commented May 5, 2019

@SataQiu thanks
/lgtm

@chenrui333

This comment has been minimized.

Copy link
Member

commented May 5, 2019

Thanks for taking the initiative!! Great job!
/lgtm

@chenrui333

This comment has been minimized.

Copy link
Member

commented May 5, 2019

@SataQiu
Besides resolving the conflicts, the only concern is to only having content-zh related changes.

That may require one more additional commit.

SataQiu added some commits May 5, 2019

@SataQiu SataQiu force-pushed the SataQiu:merge-release-1.14 branch from aeed18f to b6a3c8c May 5, 2019

@k8s-ci-robot

This comment has been minimized.

Copy link

commented May 5, 2019

Keywords which can automatically close issues and at(@) mentions are not allowed in commit messages.

The list of commits with invalid commit messages:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@zhangxiaoyu-zidif

This comment has been minimized.

Copy link
Member

commented May 5, 2019

/lgtm
/approve

@k8s-ci-robot

This comment has been minimized.

Copy link

commented May 5, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zhangxiaoyu-zidif

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 ed7e215 into kubernetes:release-1.14 May 5, 2019

6 of 8 checks passed

tide Not mergeable. Should not have do-not-merge/invalid-commit-message label.
Details
Pages changed 38 new files uploaded
Details
Header rules 1 header rule processed
Details
Mixed content No mixed content detected
Details
Redirect rules 505 redirect rules processed
Details
cla/linuxfoundation SataQiu authorized
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details
@zhangxiaoyu-zidif

This comment has been minimized.

Copy link
Member

commented May 5, 2019

It's a big job. Some one commit wrong or invalid commit messages in this PR, but it's too hard to find it out. After inner zh-conversations, we ignore it currently.

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.