Skip to content

Conversation

@yiwu-arbug
Copy link
Contributor

@yiwu-arbug yiwu-arbug commented Jun 12, 2020

Signed-off-by: Yi Wu yiwu@pingcap.com

What is changed, added or deleted? (Required)

The "Enable Stored Data Encryption" document is out-dated (the feature is removed in 4.0.0) and replaced by the "Encryption-At-Rest" document.

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)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-4.0, needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

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

Signed-off-by: Yi Wu <yiwu@pingcap.com>
@yikeke yikeke added the translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. label Jun 13, 2020
@yikeke
Copy link
Contributor

yikeke commented Jun 13, 2020

/merge

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

sre-bot commented Jun 13, 2020

/run-all-tests

@sre-bot sre-bot merged commit 0e2d3bc into pingcap:master Jun 13, 2020
sre-bot pushed a commit to sre-bot/docs that referenced this pull request Jun 13, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Jun 13, 2020

cherry pick to release-4.0 in PR #2848

sre-bot added a commit that referenced this pull request Jun 13, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@yiwu-arbug yiwu-arbug deleted the enc_outdated branch July 7, 2021 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Development

Successfully merging this pull request may close these issues.

3 participants