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

chores: update from master #6594

Merged
merged 186 commits into from
Oct 8, 2021

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Oct 8, 2021

What is changed, added or deleted? (Required)

Update master from

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • 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)?

  • This PR is translated from:
  • Other reference 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

en-jin19 and others added 30 commits July 15, 2021 19:11
en-jin19 and others added 18 commits September 26, 2021 15:48
* releases: add TiDB 5.1.2-10-06-33 release notes

* releases: add TiDB 5.1.2-10-06-33 release notes
* Update releases/release-5.1.2-10-06-33.md

* toc

* Apply suggestions from code review

Co-authored-by: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com>

* Update releases/release-5.1.2.md

* Update releases/release-5.1.2.md

* add notes from comments

* add more tidb notes

* Update releases/release-5.1.2.md

Co-authored-by: Yuanjia Zhang <qw4990@163.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com>
Co-authored-by: Enwei <jinenwei@pingcap.com>
Co-authored-by: xixirangrang <35301108+hfxsd@users.noreply.github.com>

* Update releases/release-5.1.2.md

Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>

* Update releases/release-5.1.2.md

Co-authored-by: Yuanjia Zhang <qw4990@163.com>

* Apply suggestions from code review

Co-authored-by: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com>
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>

* replace pr numbers with issue numbers

* Update releases/release-5.1.2.md

Co-authored-by: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com>
Co-authored-by: Enwei <jinenwei@pingcap.com>

* fix

* Update releases/release-5.1.2.md

* Update releases/release-5.1.2.md

* Apply suggestions from code review

* Update releases/release-5.1.2.md

* Update releases/release-5.1.2.md

Co-authored-by: Enwei <jinenwei@pingcap.com>

* Update releases/release-5.1.2.md

Co-authored-by: Grace Cai <qqzczy@126.com>

* Update releases/release-5.1.2.md

* Apply suggestions from code review

* Apply suggestions from code review

* Update releases/release-5.1.2.md

* Update releases/release-5.1.2.md

Co-authored-by: Enwei <jinenwei@pingcap.com>

* Update releases/release-5.1.2.md

Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>

* Update releases/release-5.1.2.md

* Update releases/release-5.1.2.md

* Apply suggestions from code review

* move notes

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com>
Co-authored-by: Grace Cai <qqzczy@126.com>
Co-authored-by: Yuanjia Zhang <qw4990@163.com>
Co-authored-by: Enwei <jinenwei@pingcap.com>
Co-authored-by: xixirangrang <35301108+hfxsd@users.noreply.github.com>
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 8, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Liuxiaozhen12

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.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 8, 2021
@TomShawn TomShawn added translation/no-need No need to translate this PR. and removed missing-translation-status This PR does not have translation status info. labels Oct 8, 2021
@TomShawn TomShawn changed the title Updat master from chores: update from master Oct 8, 2021
@TomShawn TomShawn added the require-LGT1 Indicates that the PR requires an LGTM. label Oct 8, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 8, 2021
@TomShawn TomShawn merged commit 7a93371 into pingcap:refactor-migration-docs Oct 8, 2021
@TomShawn TomShawn deleted the updat-master-from branch October 8, 2021 10:23
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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/LGT1 Indicates that a PR has LGTM 1. translation/no-need No need to translate this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.