Skip to content
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.

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

Comply with §2.2.2 of Anonymous Terminus extension (backport #12391) #12397

Merged
merged 2 commits into from
Sep 27, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 27, 2024

Comply with section 2.2.2 Routing Errors:
https://docs.oasis-open.org/amqp/anonterm/v1.0/cs01/anonterm-v1.0-cs01.html#doc-routingerrors

Docs PR:
rabbitmq/rabbitmq-website#2082


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

Comply with section 2.2.2 Routing Errors:
https://docs.oasis-open.org/amqp/anonterm/v1.0/cs01/anonterm-v1.0-cs01.html#doc-routingerrors

(cherry picked from commit 6863ae1)

# Conflicts:
#	deps/rabbit/src/rabbit_amqp_session.erl
@mergify mergify bot added the conflicts label Sep 27, 2024
Copy link
Author

mergify bot commented Sep 27, 2024

Cherry-pick of 6863ae1 has failed:

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

You are currently cherry-picking commit 6863ae14dd.
  (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/amqp10_client/src/amqp10_client_session.erl
	modified:   deps/rabbit/test/amqp_address_SUITE.erl
	modified:   deps/rabbit/test/amqp_auth_SUITE.erl
	modified:   deps/rabbit/test/amqp_client_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/src/rabbit_amqp_session.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 mergify bot assigned ansd Sep 27, 2024
The message size histogram metric is available on main and will ship in
RabbitMQ 4.1, but isn't available in RabbitMQ v4.0.x
@acogoluegnes acogoluegnes added this to the 4.0.3 milestone Sep 27, 2024
@ansd ansd merged commit 7e6a666 into v4.0.x Sep 27, 2024
240 checks passed
@ansd ansd deleted the mergify/bp/v4.0.x/pr-12391 branch September 27, 2024 09: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.

2 participants