Closed mergify[bot] closed 1 month ago
Cherry-pick of 26b6700e84f6fd9d6c855d474cf36381c7096080 has failed:
On branch mergify/bp/2.10.x/pr-768
Your branch is up to date with 'origin/2.10.x'.
You are currently cherry-picking commit 26b6700.
(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: docs/fastdds/transport/listening_locators.rst
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: code/DDSCodeTester.cpp
both modified: docs/fastdds/dds_layer/core/policy/eprosimaExtensions.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
Description
This PR improves the usage and definition of
mutation_tries
and gives extra information about theparticipantId
usage too.@Mergifyio backport 2.14.x 2.10.x 2.6.x
Fixes eProsima/Fast-DDS#4754
Contributor Checklist
Reviewer Checklist
This is an automatic backport of pull request #768 done by Mergify.