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

[Doc] Update SQL Blacklist (backport #48996) #49021

Merged
merged 3 commits into from
Jul 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 27, 2024

Signed-off-by: EsoragotoSpirit [email protected]

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #48996 done by [Mergify](https://mergify.com). Signed-off-by: EsoragotoSpirit

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

(cherry picked from commit 5cf740c)

# Conflicts:
#	docs/en/sql-reference/sql-statements/Administration/ADD_SQLBLACKLIST.md
#	docs/zh/sql-reference/sql-statements/Administration/ADD_SQLBLACKLIST.md
@mergify mergify bot added the conflicts label Jul 27, 2024
Copy link
Contributor Author

mergify bot commented Jul 27, 2024

Cherry-pick of 5cf740c has failed:

On branch mergify/bp/branch-2.5/pr-48996
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 5cf740c0c1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/en/administration/Blacklist.md
	modified:   docs/zh/administration/Blacklist.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/sql-reference/sql-statements/Administration/ADD_SQLBLACKLIST.md
	both modified:   docs/zh/sql-reference/sql-statements/Administration/ADD_SQLBLACKLIST.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jul 27, 2024
24 tasks
@github-actions github-actions bot added documentation Improvements or additions to documentation automerge labels Jul 27, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) July 27, 2024 05:02
@mergify mergify bot closed this Jul 27, 2024
auto-merge was automatically disabled July 27, 2024 05:02

Pull request was closed

Copy link
Contributor Author

mergify bot commented Jul 27, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-48996 branch July 27, 2024 05:02
@EsoragotoSpirit EsoragotoSpirit restored the mergify/bp/branch-2.5/pr-48996 branch July 29, 2024 01:37
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) July 29, 2024 01:37
Signed-off-by: 絵空事スピリット <[email protected]>
Signed-off-by: 絵空事スピリット <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 9b2e58b into branch-2.5 Jul 29, 2024
29 of 30 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-48996 branch July 29, 2024 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge conflicts documentation Improvements or additions to documentation version:2.5.23
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants