[mergify]

This is an automatic backport of pull request #4417 done by Mergify.
Cherry-pick of 12201f4 has failed:

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

You are currently cherry-picking commit 12201f461.
  (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:   src/cpp/fastdds/publisher/DataWriterImpl.cpp
	modified:   src/cpp/fastdds/subscriber/DataReaderImpl.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsDataReader.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsDataWriter.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/dds/publisher/DataWriterTests.cpp
	both modified:   test/unittest/dds/subscriber/DataReaderTests.cpp

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

[EduPonz]

@clalancette this should fix iron from sources as well. Fortunately, the previous PR did not get merged in 2.6mx before we caught it.

[EduPonz]

@richiprosima please test this