Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 4, 2024

Attempt to fix more test flakes in CI


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

…llector_SUITE

(cherry picked from commit 2fba241)
(cherry picked from commit 3575fb5)

# Conflicts:
#	deps/rabbitmq_prometheus/test/prometheus_rabbitmq_federation_collector_SUITE.erl
@mergify mergify bot added the conflicts label Nov 4, 2024
@mergify
Copy link
Author

mergify bot commented Nov 4, 2024

Cherry-pick of 3575fb5 has failed:

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

You are currently cherry-picking commit 3575fb5492.
  (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_prometheus/test/prometheus_rabbitmq_federation_collector_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 merged commit b921008 into v3.13.x Nov 4, 2024
182 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-12647 branch November 4, 2024 18:32
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