Skip to content

[16315] Doxygen documentation: add deprecation notice to ThroughputControllerDescriptor (backport #3165)#3227

Merged
MiguelCompany merged 2 commits into2.6.xfrom
mergify/bp/2.6.x/pr-3165
Jan 26, 2023
Merged

[16315] Doxygen documentation: add deprecation notice to ThroughputControllerDescriptor (backport #3165)#3227
MiguelCompany merged 2 commits into2.6.xfrom
mergify/bp/2.6.x/pr-3165

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 18, 2023

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

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

You are currently cherry-picking commit d34a07640.
  (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/fastdds/dds/publisher/qos/DataWriterQos.hpp
	modified:   include/fastdds/rtps/attributes/WriterAttributes.h
	modified:   include/fastdds/rtps/flowcontrol/ThroughputControllerDescriptor.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/dds/core/policy/QosPolicies.hpp
	both modified:   include/fastdds/rtps/attributes/RTPSParticipantAttributes.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

…Descriptor (#3165)

* Refs #16315: deprecation notice ThroughputControllerDescriptor

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #16315: fix linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
(cherry picked from commit d34a076)

# Conflicts:
#	include/fastdds/dds/core/policy/QosPolicies.hpp
#	include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 18, 2023
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
Copy link
Copy Markdown
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

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

LGTM

@JLBuenoLopez JLBuenoLopez added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed conflicts Backport PR wich git cherry pick failed labels Jan 26, 2023
@MiguelCompany MiguelCompany merged commit 25a0666 into 2.6.x Jan 26, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-3165 branch January 26, 2023 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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