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 iceberg_catalog.md (backport #52548) #52550

Merged
merged 2 commits into from
Nov 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2024

boost search

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 #52548 done by [Mergify](https://mergify.com). boost search

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 c15d401)

# Conflicts:
#	docs/zh/data_source/catalog/iceberg_catalog.md
@mergify mergify bot added the conflicts label Nov 1, 2024
Copy link
Contributor Author

mergify bot commented Nov 1, 2024

Cherry-pick of c15d401 has failed:

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

You are currently cherry-picking commit c15d401a72.
  (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/data_source/catalog/iceberg_catalog.md
	modified:   docs/en/quick_start/iceberg.md
	modified:   docs/zh/quick_start/iceberg.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/zh/data_source/catalog/iceberg_catalog.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 Nov 1, 2024
24 tasks
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Nov 1, 2024
@mergify mergify bot closed this Nov 1, 2024
Copy link
Contributor Author

mergify bot commented Nov 1, 2024

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

Signed-off-by: DanRoscigno <[email protected]>
@DanRoscigno DanRoscigno reopened this Nov 1, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 1, 2024 14:25
@wanpengfei-git wanpengfei-git merged commit c93e6c9 into branch-3.2 Nov 1, 2024
33 of 34 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-52548 branch November 1, 2024 14:31
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:3.2.13
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants