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

Refs #20019: Add TCP listening port behavior when set to 0 (backport #598) #606

Merged
merged 1 commit into from
Dec 12, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 11, 2023

This is an automatic backport of pull request #598 done by Mergify.
Cherry-pick of 12cb668 has failed:

On branch mergify/bp/2.10.x/pr-598
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit 12cb668.
  (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:   docs/fastdds/transport/tcp/tcp.rst
	modified:   docs/fastdds/xml_configuration/transports.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   code/DDSCodeTester.cpp
	both modified:   code/XMLTester.xml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

@cferreiragonz
Copy link
Contributor

@Mergifyio rebase

Copy link
Author

mergify bot commented Dec 12, 2023

rebase

☑️ Nothing to do

  • -conflict [:pushpin: rebase requirement]
  • -closed [:pushpin: rebase requirement]

* Refs #20019: Add TCP listening port behavior when set to 0

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20019: Add info to 6.3.1 section

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20019: Update port of tcp use case

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 12cb668)
@cferreiragonz cferreiragonz merged commit 15ad1d9 into 2.10.x Dec 12, 2023
4 checks passed
@cferreiragonz cferreiragonz deleted the mergify/bp/2.10.x/pr-598 branch December 12, 2023 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants