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

fix remove no-schema config #8987

Merged
merged 6 commits into from
Apr 22, 2022
Merged

fix remove no-schema config #8987

merged 6 commits into from
Apr 22, 2022

Conversation

ran-huang
Copy link
Contributor

What is changed, added or deleted? (Required)

Fix some inconsistent expressions introduced in #8144.

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)
  • v6.1 (TiDB 6.1 versions)
  • v6.0 (TiDB 6.0 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • 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)?

  • This PR is translated from:
  • Other reference 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

@ran-huang
fix remove no-schema config
f1f6829 
Signed-off-by: Ran <huangran@pingcap.com>
@ran-huang
bump version to 5.4.0
6d79c28 
Signed-off-by: Ran <huangran@pingcap.com>
@ran-huang ran-huang added needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. area/tidb-lightning Indicates that the Issue or PR belongs to the area of TiDB Lightning. needs-cherry-pick-release-6.0 labels Apr 14, 2022
@ran-huang ran-huang requested review from sunzhaoyang and hfxsd April 14, 2022 07:51
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 14, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hfxsd

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.

@ran-huang ran-huang added the translation/doing This PR’s assignee is translating this PR. label Apr 14, 2022
@ran-huang ran-huang self-assigned this Apr 14, 2022
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 14, 2022
@ran-huang
remove extra spaces in command
b5761a0 
Signed-off-by: Ran <huangran@pingcap.com>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 14, 2022
@ran-huang ran-huang mentioned this pull request Apr 14, 2022
Merged
16 tasks
@ran-huang ran-huang added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Apr 14, 2022
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 21, 2022
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 22, 2022
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 22, 2022
hfxsd
hfxsd approved these changes Apr 22, 2022
View reviewed changes
Copy link
Collaborator

@hfxsd hfxsd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 22, 2022
@ran-huang
Copy link
Contributor Author

/verify

@ran-huang ran-huang added the require-LGT1 Indicates that the PR requires an LGTM. label Apr 22, 2022
@ran-huang
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 5c688ea

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 22, 2022
@ti-chi-bot ti-chi-bot merged commit 6f43879 into pingcap:master Apr 22, 2022
ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Apr 22, 2022
@ran-huang @ti-chi-bot
fix remove no-schema config (pingcap#8987)
e3a2e05
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 22, 2022
Merged
16 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #9119.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 22, 2022
Merged
16 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #9120.

@ran-huang ran-huang deleted the fix-no-schema branch April 22, 2022 10:30
ti-chi-bot added a commit that referenced this pull request Apr 24, 2022
@ti-chi-bot
fix remove no-schema config (#8987) (#9120)
91995a5
ti-chi-bot added a commit that referenced this pull request Apr 24, 2022
@ti-chi-bot
fix remove no-schema config (#8987) (#9119)
dff608f
This was referenced Apr 26, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hfxsd hfxsd hfxsd approved these changes

@sunzhaoyang sunzhaoyang Awaiting requested review from sunzhaoyang

Assignees

@ran-huang ran-huang

Labels
area/tidb-lightning Indicates that the Issue or PR belongs to the area of TiDB Lightning. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. require-LGT1 Indicates that the PR requires an LGTM. size/M Denotes a PR that changes 30-99 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. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ran-huang @ti-chi-bot @sunzhaoyang @hfxsd