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

By @LoisSotoLopez: Exclude policy_repair QQ test on mixed versions (backport #12666) #12667

Merged
merged 2 commits into from
Nov 5, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 5, 2024

This is #12665 by @LoisSotoLopez. References #12412 #12640 #12641.


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

(cherry picked from commit 4819801)

# Conflicts:
#	deps/rabbit/test/quorum_queue_SUITE.erl
Copy link
Author

mergify bot commented Nov 5, 2024

Cherry-pick of 4819801 has failed:

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

You are currently cherry-picking commit 4819801a33.
  (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/test/quorum_queue_SUITE.erl

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.0.4 milestone Nov 5, 2024
@michaelklishin michaelklishin merged commit 87ddf8a into v4.0.x Nov 5, 2024
194 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12666 branch November 5, 2024 17:23
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