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.1 (backport #10822) (backport #10835) #10836

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 22, 2024

This contains an important bug fix for streams on windows systems where a log could get corrupted after a simple reboot.

It also contains a few changes to how replica reader processes exit on error to avoid logging too much.


This is an automatic backport of pull request #10822 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #10835 done by [Mergify](https://mergify.com).

This contains an important bug fix for streams on windows systems
where a log could get corrupted after a simple reboot.

It also contains a few changes to how replica reader processes
exit on error to avoid logging too much.

(cherry picked from commit e29b67b)
(cherry picked from commit fb193ea)

# Conflicts:
#	MODULE.bazel
#	deps/rabbit/Makefile
Copy link
Author

mergify bot commented Mar 22, 2024

Cherry-pick of fb193ea has failed:

On branch mergify/bp/v3.12.x/pr-10835
Your branch is up to date with 'origin/v3.12.x'.

You are currently cherry-picking commit fb193ea29f.
  (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:   MODULE.bazel
	both modified:   deps/rabbit/Makefile

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

@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-10835 branch March 22, 2024 16:01
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