Skip to content

Conversation

@sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 7, 2020

cherry-pick #2002 to release-4.0


What is changed, added or deleted? (Required)

Update configuration-file.go, add description about TiDB txn-total-size-limit

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

  • master (the latest development version, including v4.0 changes for now)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

What is the related PR or file link(s)?

http://github.com/pingcap/tidb/pull/14522

@sre-bot sre-bot added size/small Changes of a small size. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. v4.0 This PR/issue applies to TiDB v4.0. labels Apr 7, 2020
@sre-bot sre-bot requested review from TomShawn and jackysp April 7, 2020 05:05
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

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

@TomShawn TomShawn merged commit d025bd0 into pingcap:release-4.0 Apr 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/small Changes of a small size. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. v4.0 This PR/issue applies to TiDB v4.0.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants