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

system-variables: add variable description (#3672) #3676

Merged
merged 3 commits into from
Aug 18, 2020
Merged

system-variables: add variable description (#3672) #3676

merged 3 commits into from
Aug 18, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #3672 to release-3.1

What is changed, added or deleted? (Required)

update description of the added variable.

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

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Have version specific changes
  • Might cause conflicts

@ti-srebot ti-srebot mentioned this pull request Aug 17, 2020
Merged
9 tasks
@ti-srebot ti-srebot added size/small Changes of a small size. type/cherry-pick-for-release-3.1 This PR is cherry-picked to release-3.1 from a source PR. labels Aug 17, 2020
@TomShawn
Copy link
Contributor

@Joyinqin Please resolve the conflict by applying version-specific changes made in pingcap/docs-cn#4219.

@TomShawn TomShawn added the status/require-change Needs the author to address comments. label Aug 17, 2020
TomShawn
TomShawn approved these changes Aug 18, 2020
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 Aug 18, 2020
@TomShawn TomShawn added the status/can-merge Indicates a PR has been approved by a committer. label Aug 18, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit aefb011 into pingcap:release-3.1 Aug 18, 2020
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

@glkappe glkappe Awaiting requested review from glkappe

@lysu lysu Awaiting requested review from lysu

Assignees

@Joyinqin Joyinqin

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. status/require-change Needs the author to address comments. type/cherry-pick-for-release-3.1 This PR is cherry-picked to release-3.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

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