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

zh: add cert-allowed-cn option #115

Merged
merged 6 commits into from
Mar 31, 2020
Merged

zh: add cert-allowed-cn option #115

merged 6 commits into from
Mar 31, 2020

Conversation

weekface
Copy link
Contributor

What is changed, added or deleted? (Required)

Which TiDB Operator version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v1.1 (TiDB Operator 1.1 versions)
  • v1.0 (TiDB Operator 1.0 versions)

What is the related PR or file link(s)?

lilin90
lilin90 reviewed Mar 31, 2020
View reviewed changes
zh/enable-tls-between-components.md Outdated Show resolved Hide resolved
zh/enable-tls-between-components.md Outdated Show resolved Hide resolved
@lilin90 lilin90 added translation/welcome Waits for a contributor to translate this PR to docs-tidb-operator/zh or docs-tidb-operator/en. size/small Changes of a small size. needs-cherry-pick-release-1.1 Should cherry pick this PR to release-1.1 branch. labels Mar 31, 2020
@ran-huang ran-huang added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. translation/doing This PR’s assignee is translating this PR. and removed translation/welcome Waits for a contributor to translate this PR to docs-tidb-operator/zh or docs-tidb-operator/en. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. labels Mar 31, 2020
weekface and others added 3 commits March 31, 2020 18:29
@weekface @lilin90
Update zh/enable-tls-between-components.md
2377456 
Co-Authored-By: Lilian Lee <lilin@pingcap.com>
@weekface @lilin90
Update zh/enable-tls-between-components.md
6fb90f9 
Co-Authored-By: Lilian Lee <lilin@pingcap.com>
@ran-huang
Merge branch 'master' into cert-allowed-cn
7ea261c
lilin90
lilin90 reviewed Mar 31, 2020
View reviewed changes
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

LGTM

DanielZhangQD
DanielZhangQD approved these changes Mar 31, 2020
View reviewed changes
Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD DanielZhangQD merged commit ddd3e26 into pingcap:master Mar 31, 2020
sre-bot pushed a commit to sre-bot/docs-tidb-operator that referenced this pull request Mar 31, 2020
@weekface @lilin90
@ran-huang @sre-bot
zh: add cert-allowed-cn option (pingcap#115)
011d510 
* add `cert-allowed-cn` option

* Update zh/enable-tls-between-components.md

Co-Authored-By: Lilian Lee <lilin@pingcap.com>

* Update zh/enable-tls-between-components.md

Co-Authored-By: Lilian Lee <lilin@pingcap.com>

Co-authored-by: Lilian Lee <lilin@pingcap.com>
Co-authored-by: Ran <huangran@pingcap.com>
@sre-bot sre-bot mentioned this pull request Mar 31, 2020
Merged
3 tasks
@sre-bot
Copy link
Contributor

sre-bot commented Mar 31, 2020

cherry pick to release-1.1 in PR #143

DanielZhangQD pushed a commit that referenced this pull request Mar 31, 2020
@sre-bot @weekface
@lilin90 @ran-huang
zh: add cert-allowed-cn option (#115) (#143)
63c70aa 
* add `cert-allowed-cn` option

* Update zh/enable-tls-between-components.md

Co-Authored-By: Lilian Lee <lilin@pingcap.com>

* Update zh/enable-tls-between-components.md

Co-Authored-By: Lilian Lee <lilin@pingcap.com>

Co-authored-by: Lilian Lee <lilin@pingcap.com>
Co-authored-by: Ran <huangran@pingcap.com>

Co-authored-by: weekface <weekface@gmail.com>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
Co-authored-by: Ran <huangran@pingcap.com>
@toutdesuite toutdesuite mentioned this pull request Apr 1, 2020
Merged
3 tasks
@toutdesuite toutdesuite added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Apr 1, 2020
@sre-bot sre-bot mentioned this pull request Apr 2, 2020
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lilin90 lilin90 lilin90 left review comments

@DanielZhangQD DanielZhangQD DanielZhangQD approved these changes

Assignees

@toutdesuite toutdesuite

Labels
needs-cherry-pick-release-1.1 Should cherry pick this PR to release-1.1 branch. size/small Changes of a small size. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@weekface @sre-bot @lilin90 @DanielZhangQD @toutdesuite @ran-huang