Closed mergify[bot] closed 6 days ago
Cherry-pick of 13a1a7c7fe37432f06252e30ec90c2371f3d85a2 has failed:
On branch mergify/bp/v3.13.x/pr-11547
Your branch is up to date with 'origin/v3.13.x'.
You are currently cherry-picking commit 13a1a7c7fe.
(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/rabbit_stream_queue_SUITE.erl
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbit/test/queue_type_SUITE.erl
Cherry-pick of f919fee7f1e3613caa78cb5362cf7819b8617348 has failed:
On branch mergify/bp/v3.13.x/pr-11547
Your branch is ahead of 'origin/v3.13.x' by 2 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit f919fee7f1.
(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/quorum_queue_SUITE.erl
no changes added to commit (use "git add" and/or "git commit -a")
Cherry-pick of 3bb503013254c62d23896c69f72123c0a89d17b1 has failed:
On branch mergify/bp/v3.13.x/pr-11547
Your branch is ahead of 'origin/v3.13.x' by 8 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 3bb5030132.
(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/BUILD.bazel
both modified: deps/rabbit/test/queue_parallel_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
Improvements to many test suites in
deps/rabbit
see individual commits.This is an automatic backport of pull request #11547 done by Mergify.