Skip to content

Conversation

@ti-srebot
Copy link
Contributor

cherry-pick #3202 to release-3.1


What is changed, added or deleted? (Required)

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

Update document of privilege management, remove some incorrect discription.

  • This PR is translated from:
  • Other reference link(s):

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added contribution This PR is from a community contributor. size/small Changes of a small size. special-week PR from Document Special Week. type/cherry-pick-for-release-3.1 This PR is cherry-picked to release-3.1 from a source PR. labels Jun 22, 2020
@ti-srebot
Copy link
Contributor Author

@imtbkcat please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/docs-cn/invitations


上述示例中,`xxxx@%` 即自动添加的用户。

<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

Please help resolve conflicts. @imtbkcat

@yikeke
Copy link
Contributor

yikeke commented Jun 24, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 24, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit d70c224 into pingcap:release-3.1 Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

contribution This PR is from a community contributor. size/small Changes of a small size. special-week PR from Document Special Week. status/can-merge Indicates a PR has been approved by a committer. type/cherry-pick-for-release-3.1 This PR is cherry-picked to release-3.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants