Skip to content

Conversation

@yikeke
Copy link
Contributor

@yikeke yikeke commented Jul 28, 2020

What is changed, added or deleted? (Required)

Align pingcap/docs-cn#3541 that applies to other 4 release branches.

After this PR is merged, this file will be updated soon in #3453 on master and v4.0 branch. FYI @ran-huang @lichunzhu

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

@yikeke yikeke added needs-cherry-pick-2.1 translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Jul 28, 2020
@yikeke yikeke requested review from lichunzhu and ran-huang July 28, 2020 10:33
@yikeke yikeke marked this pull request as ready for review July 28, 2020 10:33
@yikeke yikeke added the status/PTAL This PR is ready for reviewing. label Jul 28, 2020
@yikeke
Copy link
Contributor Author

yikeke commented Jul 28, 2020

Updated. PTAL again @ran-huang

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,Thanks for your review. However, LGTM is restricted to Reviewers or higher roles.See the corresponding SIG page for more information. Related SIGs: docs(slack).

Copy link
Contributor

@ran-huang ran-huang 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

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 28, 2020
Co-authored-by: Ran <huangran@pingcap.com>
@yikeke yikeke added the require-LGT1 Indicates that the PR requires an LGTM. label Jul 28, 2020
@yikeke
Copy link
Contributor Author

yikeke commented Jul 28, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 28, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

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

cherry pick to release-2.1 in PR #3457

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

cherry pick to release-3.0 in PR #3458

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

cherry pick to release-3.1 in PR #3459

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

cherry pick to release-4.0 in PR #3460

@yikeke yikeke deleted the update-dumpling-backup branch July 28, 2020 11:52
ran-huang added a commit that referenced this pull request Jul 28, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Ran <huangran@pingcap.com>
ran-huang pushed a commit that referenced this pull request Jul 28, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
yikeke added a commit that referenced this pull request Jul 29, 2020
* cherry pick #3454 to release-2.1

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

* Update export-or-backup-using-dumpling.md

* Update export-or-backup-using-dumpling.md

* fix a link

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: yikeke <yikeke@pingcap.com>
yikeke added a commit that referenced this pull request Jul 29, 2020
* cherry pick #3454 to release-3.0

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

* Update export-or-backup-using-dumpling.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: yikeke <yikeke@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. 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