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

Update backup-and-restore-tool.md #3539

Merged
merged 7 commits into from
Aug 13, 2020
Merged

Update backup-and-restore-tool.md #3539

merged 7 commits into from
Aug 13, 2020

Conversation

ireneontheway
Copy link
Contributor

What is changed, added or deleted? (Required)

br doesn't support backup/restore on cluster with different new_collations_enabled_on_first_bootstrap value.

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

@ireneontheway ireneontheway added needs-cherry-pick-4.0 status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Aug 4, 2020
@ti-srebot
Copy link
Contributor

@TomShawn, @3pointer, PTAL.

@TomShawn TomShawn added status/require-change Needs the author to address comments. and removed status/PTAL This PR is ready for reviewing. labels Aug 7, 2020
@ti-srebot
Copy link
Contributor

@TomShawn, @3pointer, PTAL.

@ti-srebot
Copy link
Contributor

@ireneontheway, please update your pull request.

ireneontheway and others added 2 commits August 10, 2020 10:32
@ireneontheway @TomShawn
Apply suggestions from code review
96cdd9b 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@ireneontheway
Merge branch 'master' into br-collation
a34737f
@ireneontheway
Copy link
Contributor Author

@TomShawn, @3pointer, PTAL.

@ti-srebot
Copy link
Contributor

@ireneontheway, please update your pull request.

@ti-srebot
Copy link
Contributor

@TomShawn, @3pointer, PTAL.

TomShawn
TomShawn approved these changes Aug 12, 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
@3pointer PTAL

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 12, 2020
@TomShawn TomShawn added status/PTAL This PR is ready for reviewing. and removed status/require-change Needs the author to address comments. labels Aug 12, 2020
3pointer
3pointer reviewed Aug 13, 2020
View reviewed changes
Copy link
Contributor

@3pointer 3pointer 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

@3pointer,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).

@ireneontheway ireneontheway merged commit 8ac8eb5 into pingcap:master Aug 13, 2020
@ireneontheway ireneontheway deleted the br-collation branch August 13, 2020 03:34
@ireneontheway ireneontheway added status/can-merge Indicates a PR has been approved by a committer. and removed status/PTAL This PR is ready for reviewing. labels Aug 13, 2020
@ti-srebot
Copy link
Contributor

@ireneontheway Oops! auto merge is restricted to Committers of the SIG.See the corresponding SIG page for more information. Related SIGs: docs(slack).

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Aug 13, 2020
@ireneontheway @ti-srebot
cherry pick pingcap#3539 to release-4.0
0a42ac2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 13, 2020
Merged
9 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3648

ireneontheway added a commit that referenced this pull request Aug 13, 2020
@ti-srebot @ireneontheway
cherry pick #3539 to release-4.0 (#3648)
7a84cd8 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: ireneontheway <48651140+ireneontheway@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

@3pointer 3pointer 3pointer left review comments

Assignees
No one assigned
Labels
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.
Projects
None yet
Milestone
No milestone
Development

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