Skip to content

Shovel amqp1.0: fix delete after validation (backport #14415) #14420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Aug 24, 2025
Merged

Shovel amqp1.0: fix delete after validation (backport #14415) #14420

merged 2 commits into from
Aug 24, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 24, 2025

Queue-length is not supported, so it should fail already during validation and not shovel startup

Existing bug, unrelated to local shovels. It can be backported.

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

@dcorbacho @mergify
Shovel amqp1.0: fix delete after validation
5b372e6 
Queue-length is not supported, so it should fail already during validation and
not shovel startup

(cherry picked from commit b6d831b)

# Conflicts:
#	deps/rabbitmq_shovel/src/rabbit_shovel_parameters.erl
#	deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl
@mergify mergify bot added the conflicts label Aug 24, 2025
@mergify Mergify
Copy link
Author

mergify bot commented Aug 24, 2025

Cherry-pick of b6d831b has failed:

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

You are currently cherry-picking commit b6d831b11.
  (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_shovel/src/rabbit_shovel_parameters.erl
	both modified:   deps/rabbitmq_shovel/test/amqp10_dynamic_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 added this to the 4.1.4 milestone Aug 24, 2025
@michaelklishin michaelklishin merged commit db9196a into v4.1.x Aug 24, 2025
544 of 545 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.1.x/pr-14415 branch August 24, 2025 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dcorbacho dcorbacho

Labels
conflicts
Projects
None yet
Milestone
4.1.4
Development

Successfully merging this pull request may close these issues.
2 participants
@michaelklishin @dcorbacho