Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 16, 2023

This is an automatic backport of pull request #6905 done by Mergify.
Cherry-pick of f4e4db1 has failed:

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

You are currently cherry-picking commit f4e4db1d12.
  (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_binding.erl
	modified:   deps/rabbit/src/rabbit_channel.erl
	modified:   deps/rabbit/src/rabbit_exchange.erl
	modified:   deps/rabbit/src/rabbit_queue_type.erl
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/info_keys.ex
	modified:   deps/rabbitmq_stream/BUILD.bazel
	modified:   deps/rabbitmq_stream/src/Elixir.RabbitMQ.CLI.Ctl.Commands.AddSuperStreamCommand.erl
	modified:   deps/rabbitmq_stream/src/rabbit_stream.erl
	modified:   deps/rabbitmq_stream/src/rabbit_stream_metrics.erl
	modified:   deps/rabbitmq_stream/src/rabbit_stream_metrics_gc.erl
	modified:   deps/rabbitmq_stream_common/src/rabbit_stream_core.erl
	modified:   deps/rabbitmq_stream_management/BUILD.bazel
	modified:   deps/rabbitmq_stream_management/src/rabbit_stream_connections_mgmt.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

binarin and others added 3 commits January 16, 2023 17:46
There are some elixir-related messages about undefined functions, but
they don't produce warnings (yet).

(cherry picked from commit 2c4e4fb)

# Conflicts:
#	deps/rabbit/src/rabbit_channel.erl
#	deps/rabbitmq_stream/src/rabbit_stream_manager.erl
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
(cherry picked from commit f4e4db1)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_manager.erl
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
(cherry picked from commit 62e4049)
(cherry picked from commit 9d868fb)
@michaelklishin michaelklishin deleted the mergify/bp/v3.10.x/pr-6905 branch January 16, 2023 17:58
@michaelklishin
Copy link
Collaborator

@binarin the delta here is too large to backport. We might want to squash relevant Dialyzer warnings v3.10.x specifically at some point.

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