Return policy and op-policy-related fields plus delivery_limit when management stats are disabled#15651
Merged
Merged
Mergify / Rule: Automatically backport to v4.2.x (without cascade) (backport)
succeeded
Mar 6, 2026 in 0s
Backports have been created
- #15652 Return policy and op-policy-related fields plus
delivery_limitwhen management stats are disabled (backport #15651) has been created for branchv4.2.xbut encountered conflicts
Cherry-pick of fa753a1 has failed:
On branch mergify/bp/v4.2.x/pr-15651
Your branch is ahead of 'origin/v4.2.x' by 2 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit fa753a12f.
(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_classic_queue.erl
modified: deps/rabbit/src/rabbit_quorum_queue.erl
modified: deps/rabbit/src/rabbit_stream_queue.erl
modified: deps/rabbit_common/src/rabbit_json.erl
modified: deps/rabbitmq_management/src/rabbit_mgmt_db.erl
modified: deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl
modified: deps/rabbitmq_management/src/rabbit_mgmt_util.erl
modified: deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl
modified: deps/rabbitmq_management/src/rabbit_mgmt_wm_queues.erl
modified: deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: deps/rabbitmq_management/src/rabbit_mgmt_wm_user_queues.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
Loading