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

v5.2.2: Update TLS docs (#6323) #6646

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6323

What is changed, added or deleted? (Required)

Update TLS docs with:

  • TiDB 5.2.x additions
  • Remove the use of mysql_ssl_rsa_setup as this is replaced with AutoTLS
  • Add SSL Modes available in MySQL 8.0 client

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

  • master (the latest development version)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • 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)?

Closes #6387

Including this:

Not including this as it doesn't apply to v5.2:

dveeden and others added 6 commits October 19, 2021 14:33
Co-authored-by: Morgan Tocker <tocker@gmail.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: Morgan Tocker <tocker@gmail.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Oct 19, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot mentioned this pull request Oct 19, 2021
8 tasks
@ti-chi-bot ti-chi-bot added area/security Relates to TiDB security and privilege. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. type/enhancement The issue or PR belongs to an enhancement. labels Oct 19, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 19, 2021
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: a24f017

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 19, 2021
@ti-chi-bot ti-chi-bot merged commit 3a6a745 into pingcap:release-5.2 Oct 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/security Relates to TiDB security and privilege. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants