Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Sep 11, 2023

This is an automatic backport of pull request #9324 done by Mergify.
Cherry-pick of f0a29c9 has failed:

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

You are currently cherry-picking commit f0a29c95a5.
  (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/crashing_queues_SUITE.erl
	modified:   deps/rabbit_common/src/rabbit_control_misc.erl

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

Cherry-pick of 5717bcd has failed:

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

You are currently cherry-picking commit 5717bcd09d.
  (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/src/rabbit_amqqueue.erl
	both modified:   deps/rabbit_common/src/rabbit_misc.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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…SUITE reusable

(cherry picked from commit f0a29c9)

# Conflicts:
#	deps/rabbit/src/rabbit_amqqueue.erl
(cherry picked from commit dd900b4)
(cherry picked from commit 5717bcd)

# Conflicts:
#	deps/rabbit/src/rabbit_amqqueue.erl
#	deps/rabbit_common/src/rabbit_misc.erl
(cherry picked from commit 7daaee8)
…ue name arg types it accepts

(cherry picked from commit 0674cdf)
…fix bazel issues raised in MK's review

(cherry picked from commit 1d16388)
@michaelklishin michaelklishin merged commit d26d763 into v3.12.x Sep 12, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-9324 branch September 12, 2023 03:04
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