Closed mergify[bot] closed 1 week ago
Cherry-pick of a5819bf41e3503e9ba49a6d5c53cf04155588768 has failed:
On branch mergify/bp/v3.13.x/pr-11582
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 a5819bf41e.
(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/test/queue_type_SUITE.erl
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbit/test/publisher_confirms_parallel_SUITE.erl
Cherry-pick of a27771310580c9e0f94058dbfc03dd0f08a7ee16 has failed:
On branch mergify/bp/v3.13.x/pr-11582
Your branch is ahead of 'origin/v3.13.x' by 3 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit a277713105.
(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/BUILD.bazel
modified: deps/rabbit/test/clustering_recovery_SUITE.erl
modified: deps/rabbit/test/per_user_connection_channel_limit_SUITE.erl
modified: deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl
modified: deps/rabbit/test/per_user_connection_tracking_SUITE.erl
modified: deps/rabbit/test/per_vhost_connection_limit_SUITE.erl
modified: deps/rabbit/test/per_vhost_msg_store_SUITE.erl
modified: deps/rabbit/test/per_vhost_queue_limit_SUITE.erl
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbit/test/clustering_management_SUITE.erl
both modified: deps/rabbit/test/per_vhost_connection_limit_partitions_SUITE.erl
Cherry-pick of 087d701b6e5e2f30d8319c5f4d7b48d204fa3906 has failed:
On branch mergify/bp/v3.13.x/pr-11582
Your branch is ahead of 'origin/v3.13.x' by 4 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 087d701b6e.
(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)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbit/test/policy_SUITE.erl
no changes added to commit (use "git add" and/or "git commit -a")
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
The rabbitmq_management
failures are not related to this PR, I'm working on them.
various flakes and speed improvements.
This is an automatic backport of pull request #11582 done by Mergify.