Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Sep 2, 2025

Description

This PR adds some missing fields to the transport descriptor documentation.

@Mergifyio backport 3.3.x 3.2.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • Code snippets related to the added documentation have been provided.
  • Documentation tests pass locally.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • CI passes without warnings or errors.

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

@mergify mergify bot added the conflicts label Sep 2, 2025
@mergify
Copy link
Author

mergify bot commented Sep 2, 2025

Cherry-pick of 76a3e66 has failed:

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

You are currently cherry-picking commit 76a3e66.
  (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:   code/XMLTester.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/fastdds/xml_configuration/transports.rst

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

* Refs #23592: Add missing field to transport descriptor

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

* Refs #23592: Remove unneeded include

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 76a3e66)

# Conflicts:
#	docs/fastdds/xml_configuration/transports.rst
@juanlofer-eprosima juanlofer-eprosima merged commit 0565f9c into 3.2.x Oct 30, 2025
3 of 4 checks passed
@juanlofer-eprosima juanlofer-eprosima deleted the mergify/bp/3.2.x/pr-1111 branch October 30, 2025 13:21
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.

4 participants