Closed mergify[bot] closed 1 week ago
Cherry-pick of f5ef64ad06a084998394ccd86f1c295472bcd548 has failed:
On branch mergify/bp/v4.0.x/pr-12659
Your branch is up to date with 'origin/v4.0.x'.
You are currently cherry-picking commit f5ef64ad06.
(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/priv/schema/rabbit.schema
modified: deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/cluster_status_command.ex
modified: deps/rabbitmq_management/src/rabbit_mgmt_wm_overview.erl
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbitmq_management/test/rabbit_mgmt_http_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
Proposed Changes
Implements #12552. Closes #12552.
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 #12659 done by Mergify.