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) #804

Merged
merged 4 commits into from
Jun 27, 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 <[email protected]>

* Refs #21136: Apply rev

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21136: Fix XML repr.

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit f3f4f0e)

# Conflicts:
#	code/XMLTester.xml
#	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.6.x/pr-793
Your branch is up to date with 'origin/2.6.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:   docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   code/XMLTester.xml
	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

@Mario-DL
Copy link
Member

@richiprosima please test docs

@Mario-DL
Copy link
Member

We need to merge first the Fast DDS backport since backport names branches does not coincide

@Mario-DL
Copy link
Member

@richiprosima please test docs

JesusPoderoso
JesusPoderoso previously approved these changes Jun 27, 2024
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Mario-DL
Copy link
Member

@richiprosima please test docs

@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-793 branch from 8e2e435 to b29cd27 Compare June 27, 2024 08:18
@Mario-DL
Copy link
Member

@richiprosima please test docs

@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-793 branch from b29cd27 to 54858a1 Compare June 27, 2024 08:31
@Mario-DL
Copy link
Member

@richiprosima please test docs

@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-793 branch from 54858a1 to 2b9154d Compare June 27, 2024 09:06
@Mario-DL
Copy link
Member

@richiprosima please test docs

JesusPoderoso

This comment was marked as resolved.

Signed-off-by: Mario Dominguez <[email protected]>
@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-793 branch from 0ec34c4 to aaf5498 Compare June 27, 2024 09:40
@Mario-DL
Copy link
Member

@richiprosima please test docs

Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@Mario-DL Mario-DL merged commit c94b258 into 2.6.x Jun 27, 2024
4 checks passed
@Mario-DL Mario-DL deleted the mergify/bp/2.6.x/pr-793 branch June 27, 2024 10:07
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