Closed mergify[bot] closed 1 week ago
Cherry-pick of 5f4715979c5b0f0e09cae923d6f4c2386ec03e58 has failed:
On branch mergify/bp/v4.0.x/pr-12704
Your branch is up to date with 'origin/v4.0.x'.
You are currently cherry-picking commit 5f4715979c.
(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: MODULE.bazel
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: rabbitmq-components.mk
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
This osiris release contains a bug fix that would cause an osiris member to crash during recovery if certain unexpected files were present in the log directory. (.e.g ".nfsXXXXXXXXXXXX") type files used by the NFS file system when in use files are deleted.
This is an automatic backport of pull request #12704 done by Mergify.