Skip to content

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #20894

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v9.0 (TiDB 9.0 versions)
  • v8.5 (TiDB 8.5 versions)
  • v8.1 (TiDB 8.1 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 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

@ti-chi-bot ti-chi-bot added lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. v9.0-beta.3 This PR/issue applies to TiDB v9.0-beta.3. labels Nov 6, 2025
@qiancai qiancai changed the title tiflash: add a config named graceful_shutdown_wait_timeout (#20894) Do not merge until v8.5.4: tiflash: add a config named graceful_shutdown_wait_timeout (#20894) Nov 6, 2025
@qiancai qiancai self-assigned this Nov 7, 2025
@qiancai qiancai changed the base branch from release-8.5 to feature/preview-v8.5.4 November 7, 2025 09:33
@qiancai qiancai changed the title Do not merge until v8.5.4: tiflash: add a config named graceful_shutdown_wait_timeout (#20894) v8.5.4: tiflash: add a config named graceful_shutdown_wait_timeout (#20894) Nov 10, 2025
@qiancai
Copy link
Collaborator

qiancai commented Nov 10, 2025

/approve

@ti-chi-bot
Copy link

ti-chi-bot bot commented Nov 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qiancai

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Nov 10, 2025
@ti-chi-bot ti-chi-bot bot merged commit 3aef0cd into pingcap:feature/preview-v8.5.4 Nov 10, 2025
7 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-20894-to-release-8.5 branch November 10, 2025 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. v9.0-beta.3 This PR/issue applies to TiDB v9.0-beta.3.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants