Skip to content

config: ignore tiflash when show config (#24770)#24806

Merged
ti-chi-bot merged 6 commits intopingcap:release-5.0from
ti-srebot:release-5.0-a2b9cb092918
Aug 13, 2021
Merged

config: ignore tiflash when show config (#24770)#24806
ti-chi-bot merged 6 commits intopingcap:release-5.0from
ti-srebot:release-5.0-a2b9cb092918

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 20, 2021 •
edited
Loading

cherry-pick #24770 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/24806

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/24806:release-5.0-a2b9cb092918

What problem does this PR solve?

Issue Number: close #24252

Problem Summary:

What is changed and how it works?

Proposal: xxx

What's Changed:

How it Works:

Related changes

N/A

Check List

Tests

  • Integration test

Side effects

  • N/A

Release note

  • No release note

@ichn-hu @ti-srebot
cherry pick pingcap#24770 to release-5.0
e5785f5 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner May 20, 2021 14:52
@ti-srebot ti-srebot requested review from lzmhhh123 and removed request for a team May 20, 2021 14:52
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 20, 2021

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved (/lgtm + /merge) by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-srebot
Copy link
Contributor Author

ti-srebot commented May 20, 2021

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request May 20, 2021
Merged
@ti-srebot ti-srebot added sig/execution SIG execution size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels May 20, 2021
@ti-srebot ti-srebot requested review from leiysky and wshwsh12 May 20, 2021 14:52
@ti-srebot ti-srebot added this to the v5.0.1 milestone May 20, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented May 20, 2021

@ichn-hu you're already a collaborator in bot's repo.

@zimulala
Copy link
Contributor

zimulala commented May 20, 2021

/LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 20, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 3, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • wshwsh12
  • zimulala

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 3, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 12, 2021
@zhouqiang-cl
Copy link
Contributor

zhouqiang-cl commented Aug 13, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 13, 2021

This pull request has been accepted and is ready to merge.

DetailsCommit hash: e5785f5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 13, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 13, 2021

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit eb462f2 into pingcap:release-5.0 Aug 13, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.1, v5.0.4 Sep 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wshwsh12 wshwsh12 wshwsh12 approved these changes

@leiysky leiysky Awaiting requested review from leiysky

+1 more reviewer

@lzmhhh123 lzmhhh123 lzmhhh123 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ichn-hu ichn-hu

Labels

cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/5.0-cherry-pick

Projects

None yet

Milestone

v5.0.4

Development

Successfully merging this pull request may close these issues.

7 participants

@ti-srebot @ti-chi-bot @zimulala @zhouqiang-cl @wshwsh12 @lzmhhh123 @ichn-hu