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

[20733] Document how to annotate members as key in XML types (backport #746) #757

Merged
merged 2 commits into from
Jun 27, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 30, 2024

Description

This PR documents how to annotate members as key in XML types (@key equivalent)

@Mergifyio backport 2.13.x 2.10.x 2.6.x

Related implementation PR:

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

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit f95e5c9)

# Conflicts:
#	code/XMLTester.xml
@mergify mergify bot added the conflicts label Apr 30, 2024
Copy link
Author

mergify bot commented Apr 30, 2024

Cherry-pick of f95e5c9 has failed:

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

You are currently cherry-picking commit f95e5c9.
  (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:   docs/fastdds/xml_configuration/dynamic_types.rst

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

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

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Copy link
Member

@richiprosima please test docs

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