search

rabbitmq / rabbitmq-server

Open source RabbitMQ: core server and tier 1 (built-in) plugins
https://www.rabbitmq.com/
Other
12.31k stars 3.92k forks source link

Fixes for test flakes (backport #12671) (backport #12672) #12676

Closed mergify[bot] closed 2 weeks ago

mergify[bot] commented 2 weeks ago

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

mergify[bot] commented 2 weeks ago

Cherry-pick of 4d194b7411443da7c65ba11a36b7d9178d96a03d has failed:

On branch mergify/bp/v3.13.x/pr-12672
Your branch is ahead of 'origin/v3.13.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4d194b7411.
  (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/rabbitmq_management/test/clustering_prop_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