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] fix path inconsistency in code in stream load user guide doc (backport #43210) #43215

Merged
merged 2 commits into from
Mar 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 27, 2024

Signed-off-by: amber-create [email protected]

Why I'm doing:

to resolve a doc issue

What I'm doing:

fix path inconsistency between code examples and text descriptions in the stream load user guide doc.

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 #43210 done by [Mergify](https://mergify.com). Signed-off-by: amber-create

Why I'm doing:

to resolve a doc issue

What I'm doing:

fix path inconsistency between code examples and text descriptions in the stream load user guide doc.

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

…43210)

(cherry picked from commit 4d224e1)

# Conflicts:
#	docs/en/loading/StreamLoad.md
@mergify mergify bot added the conflicts label Mar 27, 2024
Copy link
Contributor Author

mergify bot commented Mar 27, 2024

Cherry-pick of 4d224e1 has failed:

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

You are currently cherry-picking commit 4d224e13dd.
  (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/StreamLoad.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/loading/StreamLoad.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

@github-actions github-actions bot added documentation Improvements or additions to documentation automerge labels Mar 27, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) March 27, 2024 07:03
@mergify mergify bot closed this Mar 27, 2024
auto-merge was automatically disabled March 27, 2024 07:03

Pull request was closed

Copy link
Contributor Author

mergify bot commented Mar 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-43210 branch March 27, 2024 07:04
@amber-create amber-create restored the mergify/bp/branch-2.5/pr-43210 branch March 27, 2024 07:12
@amber-create amber-create reopened this Mar 27, 2024
Signed-off-by: amber-create <[email protected]>
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) March 27, 2024 07:12
@wanpengfei-git wanpengfei-git merged commit 8b41b6a into branch-2.5 Mar 27, 2024
23 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-43210 branch March 27, 2024 07: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.21
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants