Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Osiris v1.8.4 (backport #12704) #12706

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 12, 2024

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](https://mergify.com).

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.

(cherry picked from commit 5f47159)

# Conflicts:
#	rabbitmq-components.mk
Copy link
Author

mergify bot commented Nov 12, 2024

Cherry-pick of 5f47159 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

@michaelklishin michaelklishin added this to the 4.0.4 milestone Nov 12, 2024
@michaelklishin michaelklishin merged commit b13a88d into v4.0.x Nov 12, 2024
191 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12704 branch November 12, 2024 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants