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

[21106] Add missing documentation of netmask filter and max_msg_size_no_frag in TransportConfigQos (backport #788) #789

Merged
merged 3 commits into from
Jun 6, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 29, 2024

Description

In TransportConfigQos is missing the documentation of

@Mergifyio backport 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 #788 done by [Mergify](https://mergify.com).

…in TransportConfigQos (#788)

* Refs #21106: Add missing missing documentation of netmask filter and max_msg_size_no_frag in TransportConfigQos

Signed-off-by: elianalf <[email protected]>

* Refs #21106: Apply suggestions

Signed-off-by: elianalf <[email protected]>

* Refs #21106: Add namespace

Signed-off-by: elianalf <[email protected]>

---------

Signed-off-by: elianalf <[email protected]>
(cherry picked from commit 5b807c7)

# Conflicts:
#	code/CodeTester.cpp
@mergify mergify bot added the conflicts label May 29, 2024
Copy link
Author

mergify bot commented May 29, 2024

Cherry-pick of 5b807c7 has failed:

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

You are currently cherry-picking commit 5b807c7.
  (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/DDSCodeTester.cpp
	modified:   code/XMLTester.xml
	modified:   docs/03-exports/aliases-api.include
	modified:   docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst

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

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

@EduPonz
Copy link

EduPonz commented Jun 5, 2024

@richiprosima please test this

EduPonz added 2 commits June 5, 2024 09:40
Signed-off-by: eduponz <[email protected]>
@EduPonz EduPonz force-pushed the mergify/bp/2.14.x/pr-788 branch from f70be44 to a93f843 Compare June 5, 2024 07:40
@EduPonz
Copy link

EduPonz commented Jun 5, 2024

@richiprosima please test this

@EduPonz EduPonz merged commit 159cbf7 into 2.14.x Jun 6, 2024
3 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.14.x/pr-788 branch June 6, 2024 05:48
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.

3 participants