Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 3, 2024

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

On branch mergify/bp/v3.12.x/pr-10476 Your branch is up to date with 'origin/v3.12.x'. You are currently cherry-picking commit a2ff5a0b7b. (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/rabbitmq_management_agent/src/rabbit_mgmt_metrics_gc.erl Unmerged paths: (use "git add <file>..." to mark resolution)	both modified: deps/rabbit/src/rabbit_channel.erl 

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


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

SimonUnge and others added 3 commits February 3, 2024 01:22
(cherry picked from commit a2ff5a0) # Conflicts: #	deps/rabbit/src/rabbit_channel.erl
(cherry picked from commit 3044201)
(cherry picked from commit dad9379)
@michaelklishin michaelklishin added this to the 3.12.13 milestone Feb 3, 2024
@michaelklishin michaelklishin merged commit 61f3fd1 into v3.12.x Feb 3, 2024
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-10476 branch February 3, 2024 02:13
@michaelklishin
Copy link
Collaborator

The failing suite is now cached by BuildBuddy :/ and has nothing to do with this change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

2 participants