Skip to content

Conversation

@Joyinqin
Copy link
Contributor

@Joyinqin Joyinqin commented Jul 11, 2020

What is changed, added or deleted? (Required)

Note: One link that jumps to faq/deploy-and-maintain-faq.md (added in #3241) is used in this PR, so we should first merge #3241. Otherwise, the lint check fails.

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

@Joyinqin
Copy link
Contributor Author

/label translation/from-docs-cn

@ti-srebot ti-srebot added the translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. label Jul 11, 2020
@yikeke yikeke requested review from kissmydb and lilin90 July 13, 2020 03:12
@lilin90
Copy link
Member

lilin90 commented Jul 14, 2020

@TomShawn Please help @Joyinqin to resolve the conflicts. Thanks!
@Joyinqin Please learn how to resolve a conflict.

@Joyinqin
Copy link
Contributor Author

/label needs-cherry-pick-4. 0

@ti-srebot
Copy link
Contributor

These labels are not found needs-cherry-pick-4. 0.

Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

Some content is missed or incorrect or mistakenly placed. Please also pay attention to format (missing spaces after punctuation within a paragraph, use of code block format, etc.)

Copy link
Member

@lilin90 lilin90 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 Jul 21, 2020
@lilin90 lilin90 merged commit d5a8134 into pingcap:master Jul 21, 2020
@lilin90 lilin90 changed the title Update faq Split the original FAQ to multiple files Jul 21, 2020
@lilin90
Copy link
Member

lilin90 commented Jul 21, 2020

/run-cherry-picker

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

cherry pick to release-4.0 in PR #3363

lilin90 added a commit that referenced this pull request Jul 21, 2020
* cherry pick #3240 to release-4.0

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

* Resolve the conflict

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@lilin90 lilin90 mentioned this pull request Jul 22, 2020
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/LGT1 Indicates that a PR has LGTM 1. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants