Skip to content

Conversation

@sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Jun 13, 2020

cherry-pick #3622 to release-4.0


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). The feature is replaced by "Encryption-At-Rest" which document was added in pingcap/docs#2635 but not translated yet.

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

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot added the type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. label Jun 13, 2020
@sre-bot sre-bot requested review from hicqu, ran-huang and yikeke June 13, 2020 04:13
@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 Author

sre-bot commented Jun 13, 2020

/run-all-tests

@sre-bot sre-bot merged commit 6903e56 into pingcap:release-4.0 Jun 13, 2020
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. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants