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

tispark: remove evil word 'slave' #3543

Merged
merged 2 commits into from
Aug 5, 2020
Merged

tispark: remove evil word 'slave' #3543

merged 2 commits into from
Aug 5, 2020

Conversation

Joyinqin
Copy link
Contributor

@Joyinqin Joyinqin commented Aug 5, 2020 •
edited
Loading

What is changed, added or deleted? (Required)

Remove word 'slave' in tispark document

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

  • master (the latest development version)
  • 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
  • Have version specific changes
  • Might cause conflicts

@Joyinqin
Copy link
Contributor Author

Joyinqin commented Aug 5, 2020 •
edited
Loading

/label needs-cherry-pick-2.1, needs-cherry-pick-3.0, needs-cherry-pick-3.1, needs-cherry-pick-4.0, size/small, type/enhancement, translation/from-docs-cn

@ti-srebot ti-srebot added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/enhancement The issue or PR belongs to an enhancement. labels Aug 5, 2020
@ti-srebot
Copy link
Contributor

These labels are not found needs-cherry-pick-2.1 needs-cherry-pick-3.0 needs-cherry-pick-3.1 needs-cherry-pick-4.0 size/small.

@Joyinqin
Copy link
Contributor Author

Joyinqin commented Aug 5, 2020

/label needs-cherry-pick-2.1, needs-cherry-pick-3.0, needs-cherry-pick-3.1, needs-cherry-pick-4.0, size/small

@ti-srebot ti-srebot added needs-cherry-pick-2.1 size/small Changes of a small size. labels Aug 5, 2020
@Joyinqin
Copy link
Contributor Author

Joyinqin commented Aug 5, 2020

/cc TomShawn

@ti-srebot ti-srebot requested a review from TomShawn August 5, 2020 07:35
TomShawn
TomShawn approved these changes Aug 5, 2020
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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 5, 2020
@TomShawn TomShawn added require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. labels Aug 5, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit e920b74 into pingcap:master Aug 5, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Aug 5, 2020
@Joyinqin @ti-srebot
cherry pick pingcap#3543 to release-2.1
de8b0ea 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 5, 2020
Merged
9 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-2.1 in PR #3553

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Aug 5, 2020
@Joyinqin @ti-srebot
cherry pick pingcap#3543 to release-3.0
4082525 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 5, 2020
Merged
9 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #3554

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Aug 5, 2020
@Joyinqin @ti-srebot
cherry pick pingcap#3543 to release-3.1
5a9f0b8 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 5, 2020
Merged
9 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-3.1 in PR #3555

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Aug 5, 2020
@Joyinqin @ti-srebot
cherry pick pingcap#3543 to release-4.0
51ab2f2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 5, 2020
Merged
9 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3556

ti-srebot added a commit that referenced this pull request Aug 6, 2020
@ti-srebot
tispark: remove evil word 'slave' (#3543) (#3556)
cdc8c9e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot added a commit that referenced this pull request Aug 6, 2020
@ti-srebot
tispark: remove evil word 'slave' (#3543) (#3553)
c62720f 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
TomShawn pushed a commit that referenced this pull request Aug 6, 2020
@ti-srebot @Joyinqin
tispark: remove evil word 'slave' (#3543) (#3554)
dfa8970 
* cherry pick #3543 to release-3.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Update tispark-overview.md

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
TomShawn pushed a commit that referenced this pull request Aug 6, 2020
@ti-srebot @Joyinqin
tispark: remove evil word 'slave' (#3543) (#3555)
bcf9104 
* cherry pick #3543 to release-3.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Update tispark-overview.md

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn TomShawn approved these changes

Assignees
No one assigned
Labels
require-LGT1 Indicates that the PR requires an LGTM. size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Joyinqin @ti-srebot @TomShawn