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 System_limit.md (backport #50542) #50732

Merged
merged 3 commits into from
Sep 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 5, 2024

Why I'm doing:

What I'm doing:

Fixes https://github.com/StarRocks/StarRocksTest/issues/8277

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 #50542 done by [Mergify](https://mergify.com). ## Why I'm doing:

What I'm doing:

Fixes https://github.com/StarRocks/StarRocksTest/issues/8277

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

Signed-off-by: meegoo <[email protected]>
(cherry picked from commit a97db92)

# Conflicts:
#	docs/en/reference/System_limit.md
#	docs/zh/reference/System_limit.md
@mergify mergify bot added the conflicts label Sep 5, 2024
Copy link
Contributor Author

mergify bot commented Sep 5, 2024

Cherry-pick of a97db92 has failed:

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

You are currently cherry-picking commit a97db920bc.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 Sep 5, 2024
24 tasks
@github-actions github-actions bot added documentation Improvements or additions to documentation automerge labels Sep 5, 2024
Copy link
Contributor Author

mergify bot commented Sep 5, 2024

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

@mergify mergify bot closed this Sep 5, 2024
@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-50542 branch September 5, 2024 06:09
@EsoragotoSpirit EsoragotoSpirit restored the mergify/bp/branch-2.5/pr-50542 branch September 5, 2024 06:11
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 5, 2024 06:12
Signed-off-by: 絵空事スピリット <[email protected]>
Signed-off-by: 絵空事スピリット <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 66b1c41 into branch-2.5 Sep 5, 2024
30 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-50542 branch September 5, 2024 06:17
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.

3 participants