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

[21231] Complete flow_controller_descriptor references in xml sections (backport #824) #828

Merged
merged 2 commits into from
Jul 12, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 27, 2024

Description

This PR completes the flow_controller_descriptor references in xml sections for the participant and datawriter sections.

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

@mergify mergify bot added the conflicts label Jun 27, 2024
Copy link
Author

mergify bot commented Jun 27, 2024

Cherry-pick of 6e7f076 has failed:

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

You are currently cherry-picking commit 6e7f076.
  (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
	modified:   code/XMLTesterExample.xml
	modified:   docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst
	modified:   docs/fastdds/xml_configuration/common.rst

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

We may add the cherry-pick to #802

@JesusPoderoso JesusPoderoso self-requested a review July 11, 2024 13:31
@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso July 12, 2024 05:33
Mario-DL and others added 2 commits July 12, 2024 08:17
* Refs #21231: Add missing <flow_controller_descriptor_list> to domainparticipant xml

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

* Refs #21231: Add missing <flow_controller_name> to datawriter xml qos

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

* Refs #21131: Apply Jesus rev

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

* Refs #21131: Apply Edu suggestion

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

---------

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

# Conflicts:
#	docs/fastdds/xml_configuration/domainparticipant.rst
Signed-off-by: JesusPoderoso <[email protected]>
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.13.x/pr-824 branch from d7313eb to 95c5219 Compare July 12, 2024 06:25
@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso July 12, 2024 06:25
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

@EduPonz EduPonz merged commit f441bea into 2.13.x Jul 12, 2024
4 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-824 branch July 12, 2024 06: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