Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 25, 2025

This is the same as the raft.data_dir option but for Osiris' data directory. Configuring this in Cuttlefish is nicer than the existing $RABBITMQ_STREAM_DIR environment variable way of changing the dir.


This is an automatic backport of pull request #14814 done by Mergify.

This is the same as the `raft.data_dir` option but for Osiris' data
directory. Configuring this in Cuttlefish is nicer than the existing
`$RABBITMQ_STREAM_DIR` environment variable way of changing the dir.

(cherry picked from commit c81fbc5)

# Conflicts:
#	deps/rabbit/priv/schema/rabbit.schema
#	deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
@mergify
Copy link
Author

mergify bot commented Nov 25, 2025

Cherry-pick of c81fbc5 has failed:

On branch mergify/bp/v4.2.x/pr-14814
Your branch is up to date with 'origin/v4.2.x'.

You are currently cherry-picking commit c81fbc5dc.
  (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/priv/schema/rabbit.schema
	both modified:   deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

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 added this to the 4.2.2 milestone Nov 25, 2025
@michaelklishin michaelklishin merged commit 0b56950 into v4.2.x Nov 25, 2025
291 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.2.x/pr-14814 branch November 25, 2025 07:50
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.

3 participants