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

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

Merged
merged 6 commits into from
Mar 8, 2021
Merged

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

merged 6 commits into from
Mar 8, 2021

Conversation

lance6716
Copy link
Contributor

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

@CharLotteiu CharLotteiu added needs-cherry-pick-release-2.0 Should cherry pick this PR to release-2.0 branch. status/PTAL This PR is ready for reviewing. translation/doing This PR’s assignee is translating this PR. labels Feb 23, 2021
@CharLotteiu CharLotteiu self-assigned this Feb 23, 2021
@lance6716
Copy link
Contributor Author

@lichunzhu @3pointer ptal

lichunzhu
lichunzhu approved these changes Feb 23, 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

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 23, 2021
CharLotteiu
CharLotteiu reviewed Feb 24, 2021
View reviewed changes
Copy link
Contributor

@CharLotteiu CharLotteiu left a comment

Choose a reason for hiding this comment

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

rest LGTM.

zh/dm-worker-configuration-file.md Outdated Show resolved Hide resolved
lance6716 and others added 2 commits February 24, 2021 14:43
@lance6716 @CharLotteiu
Update zh/dm-worker-configuration-file.md
ca6c1ef 
Co-authored-by: Charlotte Liu <37295236+CharLotteiu@users.noreply.github.com>
@CharLotteiu
Merge branch 'master' into patch-25
2b6e6dc
@ti-srebot
Copy link
Contributor

@lichunzhu, PTAL.

lichunzhu
lichunzhu approved these changes Feb 26, 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

@ti-srebot
Copy link
Contributor

@lichunzhu, @CharLotteiu, PTAL.

1 similar comment
@ti-srebot
Copy link
Contributor

@lichunzhu, @CharLotteiu, PTAL.

CharLotteiu
CharLotteiu approved these changes Mar 2, 2021
View reviewed changes
Copy link
Contributor

@CharLotteiu CharLotteiu 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-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Mar 2, 2021
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Mar 2, 2021
@ti-srebot
Copy link
Contributor

@lichunzhu, @ti-srebot, PTAL.

@CharLotteiu CharLotteiu changed the title [2.0.2] add two keepalive config in worker config file [2.0.2] zh: add two keepalive config in worker config file Mar 4, 2021
@CharLotteiu CharLotteiu mentioned this pull request Mar 4, 2021
Merged
7 tasks
@CharLotteiu CharLotteiu added translation/done This PR has been translated. and removed translation/doing This PR’s assignee is translating this PR. labels Mar 4, 2021
@ti-srebot
Copy link
Contributor

@lichunzhu, PTAL.

@CharLotteiu CharLotteiu removed the status/PTAL This PR is ready for reviewing. label Mar 8, 2021
@CharLotteiu CharLotteiu merged commit 3a6ab84 into pingcap:master Mar 8, 2021
ti-srebot pushed a commit to ti-srebot/docs-dm that referenced this pull request Mar 8, 2021
@lance6716 @ti-srebot
cherry pick pingcap#567 to release-2.0
703c5a0 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 8, 2021
Merged
7 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-2.0 in PR #583

@ti-srebot ti-srebot mentioned this pull request Mar 16, 2021
Merged
7 tasks
ti-chi-bot pushed a commit that referenced this pull request Apr 9, 2021
@ti-srebot
[2.0.2] zh: add two keepalive config in worker config file (#567) (#583)
daa03a8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ti-srebot ti-srebot ti-srebot approved these changes

@CharLotteiu CharLotteiu CharLotteiu approved these changes

@lichunzhu lichunzhu lichunzhu approved these changes

Assignees

@CharLotteiu CharLotteiu

Labels
needs-cherry-pick-release-2.0 Should cherry pick this PR to release-2.0 branch. status/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lance6716 @ti-srebot @lichunzhu @CharLotteiu