Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jul 20, 2024

This is more straightforward than configuring Osiris in the advanced configuration file.


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

This is more straightforward than configuring Osiris in the advanced
configuration file.

(cherry picked from commit eeb35d2)
(cherry picked from commit f7d6424)

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

mergify bot commented Jul 20, 2024

Cherry-pick of f7d6424 has failed:

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

You are currently cherry-picking commit f7d6424d42.
  (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/test/config_schema_SUITE_data/rabbit.snippets

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/priv/schema/rabbit.schema

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 3.13.6 milestone Jul 20, 2024
@michaelklishin michaelklishin merged commit 9186eaa into v3.13.x Jul 20, 2024
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-11764 branch July 20, 2024 23:21
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