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

tikv config file: fix a typo #4906

Merged
merged 1 commit into from Nov 16, 2020
Merged

tikv config file: fix a typo #4906

merged 1 commit into from Nov 16, 2020

Conversation

zgcbj
Copy link
Contributor

@zgcbj zgcbj commented Nov 13, 2020

What is changed, added or deleted? (Required)

Fix a typo in tikv-configuration-file.md.

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)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Have version specific changes
  • Might cause conflicts

@ti-srebot ti-srebot added the first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. label Nov 13, 2020
@CLAassistant
Copy link

CLAassistant commented Nov 13, 2020

CLA assistant check
All committers have signed the CLA.

@TomShawn
Copy link
Contributor

@zgcbj Thanks! Would you please sign the CLA for this PR be merged?

@TomShawn TomShawn changed the title fix spelling mistake(#4725) tikv config file: fix a typo Nov 13, 2020
@TomShawn TomShawn added needs-cherry-pick-3.1 size/small Changes of a small size. translation/no-need No need to translate this PR. type/bug-fix Fixes typos, wrong format, or other wrong or inaccurate document content. labels Nov 16, 2020
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
@zgcbj Thanks!

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 16, 2020
@TomShawn TomShawn merged commit f529e4e into pingcap:master Nov 16, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Nov 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #4907

ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Nov 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.1 in PR #4908

ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Nov 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #4909

TomShawn added a commit that referenced this pull request Nov 16, 2020
* cherry pick #4906 to release-3.0

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

* Apply suggestions from code review

Co-authored-by: zgcbj <1614439+zgcbj@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn pushed a commit that referenced this pull request Nov 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: zgcbj <1614439+zgcbj@users.noreply.github.com>
TomShawn added a commit that referenced this pull request Nov 16, 2020
* cherry pick #4906 to release-3.1

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

* Apply suggestions from code review

* trigger CI

* Update tikv-configuration-file.md

Co-authored-by: zgcbj <1614439+zgcbj@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@ran-huang ran-huang linked an issue Nov 17, 2020 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. size/small Changes of a small size. status/LGT1 Indicates that a PR has LGTM 1. translation/no-need No need to translate this PR. type/bug-fix Fixes typos, wrong format, or other wrong or inaccurate document content.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

wait-up-delay-duration
5 participants