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

test: remove outdated tidb-instance-id (#1062) #1071

Merged
merged 2 commits into from
Sep 18, 2021
Merged

test: remove outdated tidb-instance-id (#1062) #1071

merged 2 commits into from
Sep 18, 2021

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Sep 6, 2021 •
edited by lichunzhu
Loading

This is an automated cherry-pick of #1062

What problem does this PR solve?

In order to depend on the newest sync_diff_inspector we need to remove the outdated config field tidb-instance-id from sync_diff's config

What is changed and how it works?

Check List

Tests

  • Integration test

Code changes

Side effects

Related changes

Release note

  • No release note

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Sep 6, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • lichunzhu

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 mentioned this pull request Sep 6, 2021
Merged
lichunzhu
lichunzhu approved these changes Sep 18, 2021
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

LGTM

@lichunzhu
Copy link
Contributor

/rebuild

@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@zhouqiang-cl: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

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.

@lichunzhu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: ca10bf7

@zhouqiang-cl
Copy link
Contributor

/run-all-tests

@jebter
Copy link

jebter commented Sep 18, 2021

/run-integration-test

@jebter
Copy link

jebter commented Sep 18, 2021

/run-check

@ti-chi-bot ti-chi-bot merged commit fd0b526 into pingcap:release-5.1 Sep 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lichunzhu lichunzhu lichunzhu approved these changes

@glorv glorv glorv approved these changes

@amyangfei amyangfei amyangfei approved these changes

Assignees

@glorv glorv

Labels
cherry-pick-approved first-time-contributor size/XS status/can-merge status/LGT2 type/cherry-pick-for-release-5.1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @lichunzhu @zhouqiang-cl @jebter @amyangfei @glorv