Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 2, 2025

Upgrade Osiris to 1.8.6.


This is an automatic backport of pull request #13445 done by Mergify.
This is an automatic backport of pull request #13447 done by Mergify.

(cherry picked from commit ffcf9a2)
(cherry picked from commit 87636ad)

# Conflicts:
#	release-notes/4.1.0.md
@mergify mergify bot added the conflicts label Mar 2, 2025
@mergify
Copy link
Author

mergify bot commented Mar 2, 2025

Cherry-pick of 87636ad has failed:

On branch mergify/bp/v4.0.x/pr-13447
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit 87636adfd.
  (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:   MODULE.bazel
	modified:   rabbitmq-components.mk

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   release-notes/4.1.0.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

@michaelklishin michaelklishin added this to the 4.0.8 milestone Mar 2, 2025
@michaelklishin michaelklishin merged commit 81e87ba into v4.0.x Mar 2, 2025
266 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-13447 branch March 2, 2025 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants