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

[2.0.2] zh: add two keepalive config in worker config file (#567) #583

Merged
merged 1 commit into from
Apr 9, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 8, 2021

cherry-pick #567 to release-2.0
You can switch your code base to this Pull Request by using git-extras:

# In docs-dm repo:
git pr https://github.com/pingcap/docs-dm/pull/583

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

git push [email protected]:ti-srebot/docs-dm.git pr/583:release-2.0-3a6ab84da18d

What is changed, added, or deleted? (Required)

align with pingcap/dm#1405

Which DM version(s) do your changes apply to? (Required)

  • master (the latest development version, including v3.0 changes)
  • v2.0 (TiDB DM 2.0 versions)
  • v1.0 (TiDB DM 1.0 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

@ti-srebot ti-srebot added the type/cherry-pick-for-release-2.0 This PR is cherry-picked to release-2.0 from a source PR. label Mar 8, 2021
@ti-srebot
Copy link
Contributor Author

@lance6716 you're already a collaborator in bot's repo.

@CharLotteiu
Copy link
Contributor

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 24, 2021
@yikeke yikeke removed the status/DNM label Mar 24, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CharLotteiu

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 9, 2021
@lance6716
Copy link
Contributor

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 9, 2021
@lance6716
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 703c5a0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 9, 2021
@ti-chi-bot ti-chi-bot merged commit daa03a8 into pingcap:release-2.0 Apr 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-2.0 This PR is cherry-picked to release-2.0 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants