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 obs in loading from s3-compatible storage (backport #45544) #45548

Merged
merged 3 commits into from
May 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

Signed-off-by: evelynzhaojie <[email protected]

Why I'm doing:

obs is wrong, should change to s3 for MinIO

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

This is an automatic backport of pull request #45544 done by [Mergify](https://mergify.com). Signed-off-by: evelynzhaojie Why I'm doing:

obs is wrong, should change to s3 for MinIO

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

Signed-off-by: evelynzhaojie <[email protected]
(cherry picked from commit 3bf9dcd)

# Conflicts:
#	docs/en/loading/cloud_storage_load.md
#	docs/zh/loading/cloud_storage_load.md
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of 3bf9dcd has failed:

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

You are currently cherry-picking commit 3bf9dcdcf3.
  (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/loading/BrokerLoad.md
	modified:   docs/zh/loading/BrokerLoad.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/en/loading/cloud_storage_load.md
	deleted by us:   docs/zh/loading/cloud_storage_load.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 May 13, 2024
@github-actions github-actions bot added the documentation Improvements or additions to documentation label May 13, 2024
@mergify mergify bot closed this May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-45544 branch May 13, 2024 10:22
@evelynzhaojie evelynzhaojie restored the mergify/bp/branch-2.5/pr-45544 branch May 13, 2024 11:43
@evelynzhaojie evelynzhaojie reopened this May 13, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 13, 2024 11:44
@wanpengfei-git wanpengfei-git merged commit 40bf01f into branch-2.5 May 13, 2024
30 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-45544 branch May 13, 2024 11:48
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