Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 17, 2025

Not when the channel or the connection is closed.

References #13085, #9356


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

Not when the channel or the connection is closed.

References #13085, #9356

(cherry picked from commit 69d0382)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
@mergify mergify bot added the conflicts label Jan 17, 2025
@mergify
Copy link
Author

mergify bot commented Jan 17, 2025

Cherry-pick of 69d0382 has failed:

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

You are currently cherry-picking commit 69d0382dd.
  (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:   deps/rabbit/src/rabbit_stream_queue.erl
	modified:   deps/rabbitmq_stream/src/rabbit_stream_metrics.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_stream/src/rabbit_stream_reader.erl

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

@acogoluegnes acogoluegnes added this to the 4.0.6 milestone Jan 17, 2025
@acogoluegnes acogoluegnes merged commit 58416bb into v4.0.x Jan 17, 2025
271 of 272 checks passed
@acogoluegnes acogoluegnes deleted the mergify/bp/v4.0.x/pr-13092 branch January 17, 2025 16:31
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