8000 [Doc]Update jdbc_catalog.md (backport #60016) by mergify[bot] · Pull Request #60018 · StarRocks/starrocks · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[Doc]Update jdbc_catalog.md (backport #60016) #60018

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

Merged
merged 2 commits into from
Jun 18, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Jun 18, 2025

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.5
    • 3.4
    • 3.3

This is an automatic backport of pull request #60016 done by [Mergify](https://mergify.com).

Signed-off-by: chelsea <48942089+wangsimo0@users.noreply.github.com>
Co-authored-by: 絵空事スピリット <wanglichen@starrocks.com>
(cherry picked from commit 9653b13)

# Conflicts:
#	docs/ja/data_source/catalog/jdbc_catalog.md
Copy link
Contributor Author
mergify bot commented Jun 18, 2025

Cherry-pick of 9653b13 has failed:

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

You are currently cherry-picking commit 9653b1318a.
  (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/jdbc_catalog.md
	modified:   docs/zh/data_source/catalog/jdbc_catalog.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/ja/data_source/catalog/jdbc_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 added the conflicts label Jun 18, 2025
@mergify mergify bot mentioned this pull request Jun 18, 2025
22 tasks
@github-actions github-actions bot added documentation Improvements or additions to documentation automerge labels Jun 18, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 18, 2025 07:03
8000 @mergify mergify bot closed this Jun 18, 2025
auto-merge was automatically disabled June 18, 2025 07:03

Pull request was closed

Copy link
Contributor Author
mergify bot commented Jun 18, 2025

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

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 18, 2025 07:04
Signed-off-by: 絵空事スピリット <wanglichen@starrocks.com>
@wanpengfei-git wanpengfei-git merged commit aa93d92 into branch-3.3 Jun 18, 2025
29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-60016 branch June 18, 2025 07:09
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.3.16
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0