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.

Sign up for GitHub

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

Jump to bottom

dumpling: Update tidb-mem-quota-query configuration instructions #4942

Merged
merged 4 commits into from
Mar 4, 2021
Merged

dumpling: Update tidb-mem-quota-query configuration instructions #4942

merged 4 commits into from
Mar 4, 2021

Conversation

Joyinqin
Copy link
Contributor

@Joyinqin Joyinqin commented Mar 1, 2021

First-time contributors' checklist

What is changed, added or deleted? (Required)

Update tidb-mem-quota-query configuration instructions.

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

  • master (the latest development version)
  • 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)?

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

@Joyinqin
Copy link
Contributor Author

Joyinqin commented Mar 2, 2021

/label needs-cherry-pick-4.0, needs-cherry-pick-5.0, translation/from-docs-cn

@ti-srebot ti-srebot added needs-cherry-pick-4.0 translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Mar 2, 2021
@Joyinqin Joyinqin requested a review from TomShawn March 2, 2021 02:32
@Joyinqin Joyinqin marked this pull request as ready for review March 2, 2021 02:32
@Joyinqin
Copy link
Contributor Author

Joyinqin commented Mar 2, 2021

/cc 7yyo

TomShawn
TomShawn approved these changes Mar 4, 2021
View reviewed changes
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.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 4, 2021
TomShawn
TomShawn reviewed Mar 4, 2021
View reviewed changes
dumpling-overview.md Outdated Show resolved Hide resolved
@TomShawn TomShawn merged commit 1b8c420 into pingcap:master Mar 4, 2021
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Mar 4, 2021
@Joyinqin @ti-srebot
cherry pick pingcap#4942 to release-4.0
e3b7c40 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 4, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #4967

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Mar 4, 2021
@Joyinqin @ti-srebot
cherry pick pingcap#4942 to release-5.0
cf89ff8 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 4, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #4968

@Joyinqin Joyinqin deleted the dumpling-patch-1 branch March 4, 2021 05:55
TomShawn pushed a commit that referenced this pull request Mar 4, 2021
@ti-srebot @Joyinqin
cherry pick #4942 to release-4.0 (#4967)
96777b3 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
TomShawn pushed a commit that referenced this pull request Mar 4, 2021
@ti-srebot @Joyinqin
cherry pick #4942 to release-5.0 (#4968)
f314ff7 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn TomShawn approved these changes

Assignees
No one assigned
Labels
status/LGT1 Indicates that a PR has LGTM 1. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Joyinqin @ti-srebot @TomShawn