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

Fix CustomContent format in note #11601

Merged
merged 4 commits into from Dec 13, 2022
Merged

Conversation

Oreoxmt
Copy link
Collaborator

@Oreoxmt Oreoxmt commented Dec 13, 2022

Signed-off-by: Aolin aolin.zhang@pingcap.com

First-time contributors' checklist

What is changed, added or deleted? (Required)

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)
  • v6.6 (TiDB 6.6 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.4 (TiDB 6.4 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 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

Signed-off-by: Aolin <aolin.zhang@pingcap.com>
@Oreoxmt Oreoxmt added type/bug-fix Fixes typos, wrong format, or other wrong or inaccurate document content. translation/no-need No need to translate this PR. area/develop This PR relates to the area of TiDB App development. needs-cherry-pick-release-6.3 labels Dec 13, 2022
@Oreoxmt Oreoxmt requested a review from qiancai December 13, 2022 09:31
@Oreoxmt Oreoxmt self-assigned this Dec 13, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 13, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • qiancai

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.

@Oreoxmt Oreoxmt added the require-LGT1 Indicates that the PR requires an LGTM. label Dec 13, 2022
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 13, 2022
Signed-off-by: Aolin <aolin.zhang@pingcap.com>
@Oreoxmt Oreoxmt changed the base branch from master to release-6.1 December 13, 2022 10:03
@Oreoxmt Oreoxmt changed the base branch from release-6.1 to master December 13, 2022 10:03
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 13, 2022
@Oreoxmt Oreoxmt added needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.2 labels Dec 13, 2022
@Oreoxmt Oreoxmt requested a review from qiancai December 13, 2022 10:04
Signed-off-by: Aolin <aolin.zhang@pingcap.com>
Signed-off-by: Aolin <aolin.zhang@pingcap.com>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 13, 2022
Copy link
Collaborator

@qiancai qiancai 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 13, 2022
@Oreoxmt
Copy link
Collaborator Author

Oreoxmt commented Dec 13, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 78af8d1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 13, 2022
@ti-chi-bot ti-chi-bot merged commit 7e3f266 into pingcap:master Dec 13, 2022
@Oreoxmt Oreoxmt deleted the fix-CustomContent branch December 13, 2022 12:29
@Oreoxmt
Copy link
Collaborator Author

Oreoxmt commented Dec 13, 2022

/cherry-pick release-6.4

@Oreoxmt
Copy link
Collaborator Author

Oreoxmt commented Dec 13, 2022

/cherry-pick release-6.3

@Oreoxmt
Copy link
Collaborator Author

Oreoxmt commented Dec 13, 2022

/cherry-pick release-6.2

@Oreoxmt
Copy link
Collaborator Author

Oreoxmt commented Dec 13, 2022

/cherry-pick release-6.1

@ti-chi-bot
Copy link
Member

@Oreoxmt: new pull request created to branch release-6.4: #11605.

In response to this:

/cherry-pick release-6.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

@Oreoxmt: new pull request created to branch release-6.3: #11606.

In response to this:

/cherry-pick release-6.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

@Oreoxmt: new pull request created to branch release-6.2: #11607.

In response to this:

/cherry-pick release-6.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

@Oreoxmt: new pull request created to branch release-6.1: #11608.

In response to this:

/cherry-pick release-6.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Dec 13, 2022
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/develop This PR relates to the area of TiDB App development. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. require-LGT1 Indicates that the PR requires an LGTM. size/M Denotes a PR that changes 30-99 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. translation/no-need No need to translate this PR. type/bug-fix Fixes typos, wrong format, or other wrong or inaccurate document content.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants