Skip to content

tidb-configuration-file: change the meaning of max-memory back #3421

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
Merged
merged 4 commits into from
Jun 2, 2020
Merged

tidb-configuration-file: change the meaning of max-memory back #3421

merged 4 commits into from
Jun 2, 2020

Conversation

@SunRunAway
Copy link
Contributor

@SunRunAway SunRunAway commented May 31, 2020 •
edited by yikeke
Loading

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

@SunRunAway SunRunAway requested review from cfzjywxk and yikeke May 31, 2020 07:47
@SunRunAway SunRunAway mentioned this pull request May 31, 2020
Merged
5 tasks
@cfzjywxk
Copy link
Contributor

cfzjywxk commented May 31, 2020

LGTM

@TomShawn TomShawn added needs-cherry-pick-4.0 size/small Changes of a small size. status/LGT1 Indicates that a PR has LGTM 1. translation/doing This PR’s assignee is translating this PR. labels Jun 1, 2020
@TomShawn TomShawn self-assigned this Jun 1, 2020
yikeke
yikeke reviewed Jun 1, 2020
View reviewed changes
SunRunAway and others added 2 commits June 1, 2020 14:28
@SunRunAway @yikeke
Update tidb-configuration-file.md
6f1d894 
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@SunRunAway @yikeke
Update tidb-configuration-file.md
be2c5a2 
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@SunRunAway SunRunAway requested a review from yikeke June 2, 2020 09:34
yikeke
yikeke approved these changes Jun 2, 2020
View reviewed changes
Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

LGTM

@yikeke
Copy link
Contributor

yikeke commented Jun 2, 2020

/merge

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

sre-bot commented Jun 2, 2020

/run-all-tests

@sre-bot sre-bot merged commit de8c5a8 into pingcap:master Jun 2, 2020
sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request Jun 2, 2020
@SunRunAway @sre-bot
cherry pick pingcap#3421 to release-4.0
9221eff 
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot mentioned this pull request Jun 2, 2020
Merged
5 tasks
@sre-bot
Copy link
Contributor

sre-bot commented Jun 2, 2020

cherry pick to release-4.0 in PR #3456

yikeke pushed a commit that referenced this pull request Jun 2, 2020
@sre-bot @SunRunAway
cherry pick #3421 to release-4.0 (#3456)
4863725 
Signed-off-by: sre-bot <sre-bot@pingcap.com>

Co-authored-by: Feng Liyuan <darktemplar.f@gmail.com>
@yikeke yikeke assigned yikeke and unassigned TomShawn Jun 16, 2020
@TomShawn TomShawn mentioned this pull request Jun 29, 2020
Merged
5 tasks
@yikeke yikeke added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Jun 29, 2020
@ti-srebot ti-srebot mentioned this pull request Jun 29, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cfzjywxk cfzjywxk Awaiting requested review from cfzjywxk

1 more reviewer

@yikeke yikeke yikeke approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@yikeke yikeke

Labels

size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@SunRunAway @cfzjywxk @yikeke @sre-bot @TomShawn