Closed mergify[bot] closed 1 week ago
Cherry-pick of 145592efe95788f96da1d6d96c9b3667ebe5e733 has failed:
On branch mergify/bp/v3.13.x/pr-11415
Your branch is ahead of 'origin/v3.13.x' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 145592efe9.
(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/amqp_client/BUILD.bazel
modified: deps/amqp_client/app.bzl
deleted: deps/amqp_client/priv/schema/amqp_client.schema
deleted: deps/amqp_client/test/config_schema_SUITE.erl
deleted: deps/amqp_client/test/config_schema_SUITE_data/amqp_client.snippets
deleted: deps/amqp_client/test/config_schema_SUITE_data/certs/invalid_cacert.pem
deleted: deps/amqp_client/test/config_schema_SUITE_data/certs/invalid_cert.pem
deleted: deps/amqp_client/test/config_schema_SUITE_data/certs/invalid_key.pem
modified: deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbit/priv/schema/rabbit.schema
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
Proposed Changes
With OTP 26, would be nice to config some amqp client settings easier, for example when using the federation plugin.
Types of Changes
What types of changes does your code introduce to this project? Put an
x
in the boxes that applyChecklist
Put an
x
in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask on the mailing list. We're here to help! This is simply a reminder of what we are going to look for before merging your code.CONTRIBUTING.md
documentFurther Comments
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc.
This is an automatic backport of pull request #11415 done by Mergify.