Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 25, 2025

Issue introduced in 383ddb1.

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

Checklist

Put an x in the boxes that apply.
You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING.md document
  • I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
  • I have added tests that prove my fix is effective or that my feature works
  • All tests pass locally with my changes
  • If relevant, I have added necessary documentation to https://github.com/rabbitmq/rabbitmq-website
  • If relevant, I have added this change to the first version(s) in release-notes that I expect to introduce it

Further Comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution
you did and what alternatives you considered, etc.


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

Issue introduced in 383ddb1.

Authored-by: @lhoguin.
(cherry picked from commit 0a7c86b)
(cherry picked from commit dfe484b)

# Conflicts:
#	deps/rabbitmq_management/src/rabbit_mgmt_wm_exchange_publish.erl
#	deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_actions.erl
#	deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_get.erl
@mergify mergify bot added the conflicts label Mar 25, 2025
@mergify
Copy link
Author

mergify bot commented Mar 25, 2025

Cherry-pick of dfe484b has failed:

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

You are currently cherry-picking commit dfe484be9.
  (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/src/rabbit_mgmt_util.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_exchange_publish.erl
	both modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_actions.erl
	both modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_get.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

@michaelklishin michaelklishin merged commit f820888 into v4.0.x Mar 26, 2025
268 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-13615 branch March 26, 2025 03:02
@michaelklishin michaelklishin added this to the 4.0.8 milestone Mar 26, 2025
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