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]add more description in kafka connector and modify the name for op field (backport #43074) #43315

Merged
merged 2 commits into from
Mar 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2024

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.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #43074 done by [Mergify](https://mergify.com). ## 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

…op field (#43074)

Signed-off-by: hellolilyliuyi <[email protected]>
(cherry picked from commit 1fcce95)

# Conflicts:
#	docs/en/loading/Kafka-connector-starrocks.md
Copy link
Contributor Author

mergify bot commented Mar 28, 2024

Cherry-pick of 1fcce95 has failed:

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

You are currently cherry-picking commit 1fcce957b0.
  (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/zh/loading/Kafka-connector-starrocks.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/loading/Kafka-connector-starrocks.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 Mar 28, 2024
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Mar 28, 2024
@mergify mergify bot closed this Mar 28, 2024
Copy link
Contributor Author

mergify bot commented Mar 28, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-43074 branch March 28, 2024 06:56
@hellolilyliuyi hellolilyliuyi restored the mergify/bp/branch-2.5/pr-43074 branch March 28, 2024 07:22
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) March 28, 2024 07:23
@wanpengfei-git wanpengfei-git merged commit 3b4e0a2 into branch-2.5 Mar 28, 2024
28 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-43074 branch March 28, 2024 07:29
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.21
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants