Skip to content

*: generalize and link to the external storage docs from Lightning (#5528)#5741

Merged
ti-chi-bot merged 3 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-2c9622b744de
Mar 16, 2021
Merged

*: generalize and link to the external storage docs from Lightning (#5528)#5741
ti-chi-bot merged 3 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-2c9622b744de

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

@ti-srebot ti-srebot commented Mar 15, 2021 •
edited
Loading

cherry-pick #5528 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In docs-cn repo:
git pr https://github.com/pingcap/docs-cn/pull/5741

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/docs-cn.git pr/5741:release-4.0-2c9622b744de

What is changed, added or deleted? (Required)

Fix pingcap/docs#4445.

Generalize the "BR storage" page to "external storage", and talk about all associated migration services.

Link back to this page from their documents.

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

  • master (the latest development version)
  • v5.0 (TiDB 5.0 versions)
  • 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
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@kennytm @ti-srebot
cherry pick pingcap#5528 to release-4.0
97110f4 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 15, 2021
Merged
10 tasks
@ti-srebot ti-srebot added requires-followup This PR requires a follow-up task after being merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels Mar 15, 2021
@ti-srebot
Copy link
Copy Markdown
Contributor Author

ti-srebot commented Mar 15, 2021

@kennytm you're already a collaborator in bot's repo.

@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Mar 15, 2021

/remove-label follow-up

@ti-chi-bot ti-chi-bot removed the requires-followup This PR requires a follow-up task after being merged. label Mar 15, 2021
TomShawn
TomShawn reviewed Mar 15, 2021
View reviewed changes
Comment thread br/backup-and-restore-storages.md Outdated
Comment on lines +9 to +10
aliases: ['/docs-cn/dev/br/backup-and-restore-storages/']
>>>>>>> 2c9622b7... *: generalize and link to the external storage docs from Lightning (#5528)
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn Mar 15, 2021

Choose a reason for hiding this comment

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

Suggested change
aliases: ['/docs-cn/dev/br/backup-and-restore-storages/']
>>>>>>> 2c9622b7... *: generalize and link to the external storage docs from Lightning (#5528)
aliases: ['/docs-cn/stable/br/backup-and-restore-storages/','/docs-cn/v4.0/br/backup-and-restore-storages/']

TomShawn
TomShawn reviewed Mar 15, 2021
View reviewed changes
Comment thread br/backup-and-restore-storages.md Outdated
Comment on lines +2 to +6
<<<<<<< HEAD
title: BR 存储
summary: 了解 BR 中所用存储服务的 URL 格式。
aliases: ['/docs-cn/stable/br/backup-and-restore-storages/','/docs-cn/v4.0/br/backup-and-restore-storages/']
=======
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn Mar 15, 2021

Choose a reason for hiding this comment

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

Suggested change
<<<<<<< HEAD
title: BR 存储
summary: 了解 BR 中所用存储服务的 URL 格式。
aliases: ['/docs-cn/stable/br/backup-and-restore-storages/','/docs-cn/v4.0/br/backup-and-restore-storages/']
=======

TomShawn
TomShawn reviewed Mar 15, 2021
View reviewed changes
Comment thread tidb-lightning/monitor-tidb-lightning.md Outdated

## 监控配置

<<<<<<< HEAD
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn Mar 15, 2021

Choose a reason for hiding this comment

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

@kennytm Please resolve the conflict.

@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Mar 16, 2021

@kennytm Could you please fix the CI failure (manual line break check)?
image

@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Mar 16, 2021

/lgtm

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Mar 16, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Details

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 16, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Mar 16, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Mar 16, 2021

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 7d87e83

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 16, 2021
@ti-chi-bot ti-chi-bot merged commit b040cd3 into pingcap:release-4.0 Mar 16, 2021
@TomShawn TomShawn deleted the release-4.0-2c9622b744de branch March 16, 2021 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@3pointer 3pointer Awaiting requested review from 3pointer

@glorv glorv Awaiting requested review from glorv

@IANTHEREAL IANTHEREAL Awaiting requested review from IANTHEREAL

@overvenus overvenus Awaiting requested review from overvenus

1 more reviewer

@TomShawn TomShawn TomShawn left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@kennytm kennytm

Labels

size/L Denotes a PR that changes 100-499 lines, ignoring generated files. 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. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ti-srebot @TomShawn @ti-chi-bot @kennytm