Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Aug 8, 2025

The rabbitmq_stream.advertised_tls_host setting is not used in the metadata frame of the stream protocol, even if it is set. This commit makes sure the setting is used if set.

References rabbitmq/rabbitmq-stream-java-client#803


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

@mergify
Copy link
Author

mergify bot commented Aug 8, 2025

Cherry-pick of 22a9593 has failed:

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

You are currently cherry-picking commit 22a959331.
  (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_stream/src/rabbit_stream_reader.erl
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   deps/rabbitmq_stream/src/rabbit_stream.erl
	deleted by us:   deps/rabbitmq_stream/src/rabbit_stream_utils.hrl

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

The rabbitmq_stream.advertised_tls_host setting is not used in the
metadata frame of the stream protocol, even if it is set. This commit
makes sure the setting is used if set.

References rabbitmq/rabbitmq-stream-java-client#803

(cherry picked from commit 22a9593)

Conflicts:
	deps/rabbitmq_stream/src/rabbit_stream.erl
	deps/rabbitmq_stream/src/rabbit_stream_utils.hrl
@acogoluegnes acogoluegnes force-pushed the mergify/bp/v4.1.x/pr-14344 branch from 5e711a4 to 0245730 Compare August 8, 2025 14:29
@acogoluegnes acogoluegnes added this to the 4.1.4 milestone Aug 8, 2025
@acogoluegnes acogoluegnes merged commit 473bfef into v4.1.x Aug 8, 2025
543 of 545 checks passed
@acogoluegnes acogoluegnes deleted the mergify/bp/v4.1.x/pr-14344 branch August 8, 2025 15:40
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