Skip to content

encryption at rest: update docs (#7223)#7282

Merged
ti-chi-bot merged 3 commits into
pingcap:release-5.2from
ti-chi-bot:cherry-pick-7223-to-release-5.2
Oct 15, 2021
Merged

encryption at rest: update docs (#7223)#7282
ti-chi-bot merged 3 commits into
pingcap:release-5.2from
ti-chi-bot:cherry-pick-7223-to-release-5.2

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

@ti-chi-bot ti-chi-bot commented Oct 15, 2021

This is an automated cherry-pick of #7223

What is changed, added or deleted? (Required)

  • Updated the document "encryption-at-rest.md".
  • The changes of PR 7140 have been included in this PR, so I closed #7140.

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)
  • 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)?

  • This PR is translated from:
  1. encryption-at-rest: Update docs#6152
  2. Suggest Log Redaction when using TDE docs#6147
  • Other reference 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

en-jin19 and others added 3 commits October 15, 2021 08:38
@ti-chi-bot
Copy link
Copy Markdown
Member Author

ti-chi-bot commented Oct 15, 2021 •
edited
Loading

[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.

Details

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 15, 2021
Merged
12 tasks
@ti-chi-bot ti-chi-bot added sig/docs Indicates that the Issue or PR belongs to the docs SIG. area/engine Indicates that the Issue or PR belongs to the area of TP storage or Cloud storage. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. type/enhancement The issue or PR belongs to an enhancement. labels Oct 15, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 15, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Oct 15, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member Author

ti-chi-bot commented Oct 15, 2021

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

DetailsCommit hash: 671aff3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 15, 2021
@ti-chi-bot ti-chi-bot merged commit 831558a into pingcap:release-5.2 Oct 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TomShawn TomShawn Awaiting requested review from TomShawn

Assignees

@en-jin19 en-jin19

Labels

area/engine Indicates that the Issue or PR belongs to the area of TP storage or Cloud storage. sig/docs Indicates that the Issue or PR belongs to the docs SIG. 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. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. type/enhancement The issue or PR belongs to an enhancement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ti-chi-bot @TomShawn @en-jin19