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

secure: fix secure-related docs #3507

Merged
merged 7 commits into from
Jun 10, 2020
Merged

secure: fix secure-related docs #3507

merged 7 commits into from
Jun 10, 2020

Conversation

yikeke
Copy link
Contributor

@yikeke yikeke commented Jun 5, 2020 •
edited
Loading

What is changed, added or deleted? (Required)

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

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

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

@yikeke yikeke added needs-cherry-pick-4.0 translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. labels Jun 5, 2020
@yikeke yikeke mentioned this pull request Jun 5, 2020
Merged
5 tasks
@yikeke yikeke added the requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. label Jun 5, 2020
@yikeke yikeke requested a review from lilin90 June 5, 2020 06:07
@yikeke yikeke marked this pull request as ready for review June 5, 2020 06:07
@yikeke yikeke requested a review from lysu June 5, 2020 06:08
lysu
lysu reviewed Jun 5, 2020
View reviewed changes
Copy link
Contributor

@lysu lysu left a comment

Choose a reason for hiding this comment

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

LGTM

@sre-bot sre-bot mentioned this pull request Jun 9, 2020
Merged
5 tasks
lilin90
lilin90 approved these changes Jun 9, 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

@lilin90
Copy link
Member

lilin90 commented Jun 9, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 9, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Jun 9, 2020

/run-all-tests

@lilin90
Copy link
Member

lilin90 commented Jun 9, 2020

Please fix a link.

@sre-bot
Copy link
Contributor

sre-bot commented Jun 9, 2020

@yikeke merge failed.

@yikeke yikeke merged commit af377d7 into pingcap:master Jun 10, 2020
@yikeke yikeke deleted the fix-security-docs branch June 10, 2020 02:17
sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request Jun 10, 2020
@yikeke @sre-bot
cherry pick pingcap#3507 to release-4.0
1bcc238 
Signed-off-by: sre-bot <[email protected]>
@sre-bot sre-bot mentioned this pull request Jun 10, 2020
Merged
5 tasks
@sre-bot
Copy link
Contributor

sre-bot commented Jun 10, 2020

cherry pick to release-4.0 in PR #3580

yikeke added a commit that referenced this pull request Jun 10, 2020
@sre-bot @yikeke
secure: fix secure-related docs (#3507) (#3580)
dae0824 
* cherry pick #3507 to release-4.0

Signed-off-by: sre-bot <[email protected]>

* Update enable-tls-between-clients-and-servers.md

Co-authored-by: Keke Yi <[email protected]>
@yikeke yikeke self-assigned this Jun 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lysu lysu lysu left review comments

@lilin90 lilin90 lilin90 approved these changes

Assignees

@yikeke yikeke

Labels
requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. status/can-merge Indicates a PR has been approved by a committer. 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.
4 participants
@yikeke @lilin90 @sre-bot @lysu