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.

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

session: Update bootstrap version #26006

Merged
merged 2 commits into from
Jul 7, 2021

Conversation

morgo
Copy link
Contributor

@morgo morgo commented Jul 6, 2021

What problem does this PR solve?

Problem Summary:

This fixes an error in #25749

In the v4.0 branch, the bootstrap version is stored in session/session.go and not session/bootstrap.go. I missed it when porting the patch from master.

This only affects the v4.0 branch, and not the v5.0 or v5.1 cherry pick.

What is changed and how it works?

What's Changed:

The bootstrap version is incremented.

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • None

Side effects

  • None

Release note

  • No release note

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 6, 2021
@morgo morgo requested review from bb7133 and xhebox July 6, 2021 14:24
@github-actions github-actions bot added the sig/sql-infra SIG: SQL Infra label Jul 6, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 7, 2021
@jebter jebter added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 7, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • xhebox

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-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 Jul 7, 2021
@bb7133
Copy link
Member

bb7133 commented Jul 7, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 63821a7

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

@morgo: 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.

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 32fb06a into pingcap:release-4.0 Jul 7, 2021
@zhouqiang-cl zhouqiang-cl added this to the v4.0.14 milestone Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/sql-infra SIG: SQL Infra 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants