Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 21, 2025


This is an automatic backport of pull request #13105 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jan 21, 2025
@mergify
Copy link
Author

mergify bot commented Jan 21, 2025

Cherry-pick of 31a4d61 has failed:

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

You are currently cherry-picking commit 31a4d611f.
  (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
	new file:   deps/rabbit/test/rabbit_list_test_event_handler.erl
	modified:   deps/rabbit/test/rabbit_stream_queue_SUITE.erl
	modified:   deps/rabbitmq_stream/src/rabbit_stream_metrics.erl
	modified:   deps/rabbitmq_stream/src/rabbit_stream_reader.erl
	new file:   deps/rabbitmq_stream/test/rabbit_list_test_event_handler.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
	both modified:   deps/rabbitmq_stream/test/rabbit_stream_reader_SUITE.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

@michaelklishin michaelklishin added this to the 4.0.6 milestone Jan 21, 2025
@acogoluegnes acogoluegnes force-pushed the mergify/bp/v4.0.x/pr-13105 branch from c788eb0 to 066ad00 Compare January 21, 2025 14:02
@acogoluegnes acogoluegnes merged commit 70b04ae into v4.0.x Jan 21, 2025
271 of 272 checks passed
@acogoluegnes acogoluegnes deleted the mergify/bp/v4.0.x/pr-13105 branch January 21, 2025 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants