Skip to content

br:tidy up the incompatible issues in using BR tools (#5288)#5382

Merged
ti-chi-bot merged 2 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-11882d31c18c
Apr 19, 2021
Merged

br:tidy up the incompatible issues in using BR tools (#5288)#5382
ti-chi-bot merged 2 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-11882d31c18c

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

@ti-srebot ti-srebot commented Apr 19, 2021

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

# In docs repo:
git pr https://github.com/pingcap/docs/pull/5382

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

git push git@github.com:ti-srebot/docs.git pr/5382:release-4.0-11882d31c18c

What is changed, added or deleted? (Required)

  • Tidy up the incompatible issues in using BR tools.
  • update minimum BR requirements

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

  • master (the latest development version)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions) version specific changes Update compatibility of BR (#5905) docs-cn#5968
  • 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
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels Apr 19, 2021
@ti-srebot
Copy link
Copy Markdown
Contributor Author

@TomShawn you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 19, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

/lgtm

@ti-chi-bot
Copy link
Copy Markdown
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 19, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

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

DetailsCommit hash: 647623f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 19, 2021
@ti-chi-bot ti-chi-bot merged commit 771edfa into pingcap:release-4.0 Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants