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

[20413] Fix doxygen docs warnings. Prepare for compiling with Doxygen 1.10.0 (backport #4376) #4393

Merged
merged 2 commits into from
Feb 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 16, 2024

This is an automatic backport of pull request #4376 done by Mergify.
Cherry-pick of dcf1c62 has failed:

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

You are currently cherry-picking commit dcf1c622c.
  (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:   include/fastrtps/config/doxygen_modules.h
	modified:   include/fastrtps/types/TypeIdentifierTypes.h
	modified:   include/fastrtps/types/TypeObjectHashId.h
	modified:   include/fastrtps/xmlparser/XMLEndpointParser.h
	modified:   include/fastrtps/xmlparser/XMLProfileManager.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastrtps/types/AnnotationParameterValue.h

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 16, 2024
@EduPonz EduPonz added this to the v2.6.8 milestone Feb 21, 2024
@Mario-DL Mario-DL added the no-test Skip CI tests if PR marked with this label label Feb 23, 2024
…4376)

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL removed the conflicts Backport PR wich git cherry pick failed label Feb 23, 2024
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Copy link
Member

@richiprosima please test linux

@Mario-DL Mario-DL added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Feb 29, 2024
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

LGTM

@EduPonz EduPonz merged commit a0b3633 into 2.6.x Feb 29, 2024
11 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4376 branch February 29, 2024 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-test Skip CI tests if PR marked with this label ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants