Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 4, 2023

This is an automatic backport of pull request #6790 done by Mergify.
Cherry-pick of 79990e8 has failed:

On branch mergify/bp/v3.11.x/pr-6790
Your branch is up to date with 'origin/v3.11.x'.

You are currently cherry-picking commit 79990e8eae.
  (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_sac_coordinator.erl
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_stream/src/rabbit_stream_manager.erl
	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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 79990e8)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_manager.erl
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
We don't want clients to try to connect to those.

Fixes #3370

(cherry picked from commit d2443b5)
(cherry picked from commit 3fea81a)
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.

3 participants