Skip to content

Remove POODLE check (backport #9843) (backport #9845) #9849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 1, 2023

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

On branch mergify/bp/v3.11.x/pr-9845
Your branch is ahead of 'origin/v3.11.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a73551387a.
  (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/rabbitmq_stomp/src/rabbit_stomp_sup.erl
	modified:   deps/rabbitmq_stream/src/rabbit_stream_sup.erl
	modified:   deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_sup.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/src/rabbit_networking.erl
	both modified:   deps/rabbitmq_mqtt/src/rabbit_mqtt_sup.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

deadtrickster and others added 3 commits November 1, 2023 20:10
(cherry picked from commit 728dd57)
(cherry picked from commit fcebf36)
(cherry picked from commit c577e04)
(cherry picked from commit a735513)

# Conflicts:
#	deps/rabbit/src/rabbit_networking.erl
#	deps/rabbitmq_mqtt/src/rabbit_mqtt_sup.erl
(cherry picked from commit 9bab2f2)
(cherry picked from commit 3c3f213)
@mergify mergify bot added the conflicts label Nov 1, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-9845 branch November 1, 2023 20:32
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