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

BR: update br keep upstream (#26972) #27003

Merged
merged 1 commit into from
Aug 18, 2021
Merged

BR: update br keep upstream (#26972) #27003

merged 1 commit into from
Aug 18, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 9, 2021 •
edited
Loading

cherry-pick #26972 to release-5.2
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/27003

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

git push git@github.com:ti-srebot/tidb.git pr/27003:release-5.2-a7fdc2a05663

What problem does this PR solve?

Problem Summary:

update br to latest with subtree upstream

What is changed and how it works?

Proposal: xxx

What's Changed:

Check List

Tests

  • Unit test
  • Integration test

Release note 

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 9, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YuJuncen
  • glorv

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.

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

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 9, 2021
@ti-srebot ti-srebot mentioned this pull request Aug 9, 2021
Merged
2 tasks
@ti-srebot ti-srebot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/5.2-cherry-pick labels Aug 9, 2021
@ti-srebot
Copy link
Contributor Author

@3pointer please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/tidb/invitations

@3pointer
Copy link
Contributor

3pointer commented Aug 9, 2021

/sig migrate

@3pointer
Copy link
Contributor

3pointer commented Aug 9, 2021

/rebuild

1 similar comment
@purelind
Copy link
Contributor

purelind commented Aug 9, 2021

/rebuild

@3pointer
Copy link
Contributor

3pointer commented Aug 9, 2021

/run-integration-tests

1 similar comment
@3pointer
Copy link
Contributor

3pointer commented Aug 9, 2021

/run-integration-tests

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 12, 2021
@ti-chi-bot ti-chi-bot added the component/br This issue is related to BR of TiDB. label Aug 12, 2021
@kennytm
Copy link
Contributor

kennytm commented Aug 12, 2021

/component br
/component lightning

@ti-chi-bot ti-chi-bot added the component/lightning This issue is related to Lightning of TiDB. label Aug 12, 2021
@3pointer
cherry pick pingcap#26972 to release-5.2
a648667 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@3pointer
Copy link
Contributor

/cherry-pick-invite

@ti-chi-bot ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 18, 2021
@3pointer
Copy link
Contributor

/cherry-pick-invite

1 similar comment
@3pointer
Copy link
Contributor

/cherry-pick-invite

@ti-srebot
Copy link
Contributor Author

@3pointer please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/tidb/invitations

@3pointer
Copy link
Contributor

/run-check_dev

@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@3pointer: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

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 added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 18, 2021
@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 Aug 18, 2021
@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: a648667

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 18, 2021
@ti-chi-bot ti-chi-bot merged commit e08a790 into pingcap:release-5.2 Aug 18, 2021
@kennytm kennytm deleted the release-5.2-a7fdc2a05663 branch June 28, 2022 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YuJuncen YuJuncen YuJuncen approved these changes

@glorv glorv glorv approved these changes

Assignees

@3pointer 3pointer

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/br This issue is related to BR of TiDB. component/lightning This issue is related to Lightning of TiDB. release-note-none Denotes a PR that doesn't merit a release note. sig/migrate size/XXL Denotes a PR that changes 1000+ 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/5.2-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @ti-chi-bot @3pointer @purelind @kennytm @glorv @YuJuncen @zhouqiang-cl