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

tidb-configuration-file: add tls-version #9318

Merged
merged 2 commits into from
May 10, 2022

Conversation

shichun-0415
Copy link
Contributor

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v6.1 (TiDB 6.1 versions)
  • v6.0 (TiDB 6.0 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)

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

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 6, 2022

[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 requested a review from TomShawn May 6, 2022 12:43
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 6, 2022
@shichun-0415 shichun-0415 added area/security Relates to TiDB security and privilege. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. needs-cherry-pick-release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. translation/from-docs This PR is translated from a PR in pingcap/docs. and removed missing-translation-status This PR does not have translation status info. labels May 6, 2022
Copy link
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

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

rest LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 10, 2022
@shichun-0415 shichun-0415 added the require-LGT1 Indicates that the PR requires an LGTM. label May 10, 2022
@shichun-0415
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9bd064a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 10, 2022
@ti-chi-bot ti-chi-bot merged commit 3992309 into pingcap:master May 10, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #9394.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #9395.

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request May 10, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #9396.

@shichun-0415 shichun-0415 deleted the tls-version branch May 10, 2022 11:13
shichun-0415 added a commit that referenced this pull request May 10, 2022
* This is an automated cherry-pick of #9318

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

* resolve conflict

Co-authored-by: shichun-0415 <[email protected]>
Co-authored-by: shichun-0415 <[email protected]>
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. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. require-LGT1 Indicates that the PR requires an LGTM. size/S Denotes a PR that changes 10-29 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. translation/from-docs This PR is translated from a PR in pingcap/docs. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants