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

update config template #7827

Merged
merged 1 commit into from
Mar 11, 2022
Merged

update config template #7827

merged 1 commit into from
Mar 11, 2022

Conversation

lichunzhu
Copy link
Contributor

@lichunzhu lichunzhu commented Mar 10, 2022 •
edited
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

Change tidb-binlog to tidb_binlog in deploy meta.yaml because the former way will make drainer fails.

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.

  • master (the latest development version)
  • 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)?

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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 10, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn
  • shichun-0415

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 requested a review from TomShawn March 10, 2022 08:45
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 10, 2022
@lichunzhu lichunzhu added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. and removed missing-translation-status This PR does not have translation status info. labels Mar 10, 2022
@TomShawn TomShawn added area/tidb-binlog Indicates that the Issue or PR belongs to the area of tidb-binlog. area/tiup Indicates that the Issue or PR belongs to the area of the TiUP tool. type/bugfix This PR fixes a bug. needs-cherry-pick-release-4.0 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Mar 10, 2022
TomShawn
TomShawn approved these changes Mar 10, 2022
View reviewed changes
Copy link
Contributor

@TomShawn TomShawn 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 Mar 10, 2022
shichun-0415
shichun-0415 approved these changes Mar 11, 2022
View reviewed changes
Copy link
Contributor

@shichun-0415 shichun-0415 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 11, 2022
@shichun-0415
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 72560df

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 11, 2022
@ti-chi-bot ti-chi-bot merged commit 5e3e7c6 into pingcap:master Mar 11, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 11, 2022
Merged
16 tasks
@ti-chi-bot
Copy link
Member

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

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

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

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

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

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Mar 11, 2022
@lichunzhu @ti-chi-bot
This is an automated cherry-pick of pingcap#7827
93a06ba 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 11, 2022
Merged
16 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Mar 11, 2022
@lichunzhu @ti-chi-bot
This is an automated cherry-pick of pingcap#7827
ece3e06 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 11, 2022
Merged
16 tasks
@ti-chi-bot
Copy link
Member

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

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

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

ti-chi-bot added a commit that referenced this pull request Mar 11, 2022
@ti-chi-bot
update config template (#7827) (#7831)
88dc61f
ti-chi-bot added a commit that referenced this pull request Mar 11, 2022
@ti-chi-bot
update config template (#7827) (#7833)
2e910e0
ti-chi-bot added a commit that referenced this pull request Mar 11, 2022
@ti-chi-bot
update config template (#7827) (#7832)
1f55512
ti-chi-bot added a commit that referenced this pull request Mar 11, 2022
@ti-chi-bot
update config template (#7827) (#7836)
090e33f
ti-chi-bot added a commit that referenced this pull request Mar 14, 2022
@ti-chi-bot
update config template (#7827) (#7835)
2fb9e9a
ti-chi-bot added a commit that referenced this pull request Mar 14, 2022
@ti-chi-bot
update config template (#7827) (#7834)
fd4fe45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shichun-0415 shichun-0415 shichun-0415 approved these changes

@TomShawn TomShawn TomShawn approved these changes

Assignees
No one assigned
Labels
area/tidb-binlog Indicates that the Issue or PR belongs to the area of tidb-binlog. area/tiup Indicates that the Issue or PR belongs to the area of the TiUP tool. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. 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. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lichunzhu @ti-chi-bot @shichun-0415 @TomShawn