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

[21136] Add XML configuration for FlowControllerDescriptor to 2.x (backport #793) #803

Merged
merged 2 commits into from
Sep 11, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 6, 2024

Description

This PR is a backport from #782 to 2.x. It adds the XML documentation for flow controller descriptors.

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

* Refs #21136: Add XML Flow Controller Descriptors documentation

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21136: Apply rev

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21136: Fix XML repr.

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit f3f4f0e)

# Conflicts:
#	docs/fastdds/use_cases/large_data/large_data.rst
@mergify mergify bot added the conflicts label Jun 6, 2024
Copy link
Author

mergify bot commented Jun 6, 2024

Cherry-pick of f3f4f0e has failed:

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

You are currently cherry-picking commit f3f4f0e.
  (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/fastdds/dds_layer/core/policy/eprosimaExtensions.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/fastdds/use_cases/large_data/large_data.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

@JesusPoderoso JesusPoderoso added this to the v2.10.5 milestone Jun 6, 2024
@MiguelCompany MiguelCompany added the implementation-pending Marks doc PRs which corresponding implementation is not yet available on Fast DDS label Jul 19, 2024
@MiguelCompany MiguelCompany removed the implementation-pending Marks doc PRs which corresponding implementation is not yet available on Fast DDS label Sep 11, 2024
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany merged commit c24b83f into 2.10.x Sep 11, 2024
5 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-793 branch September 11, 2024 15:00
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