[20311] Add missing TypeLookup listeners (backport #4335)
This is an automatic backport of pull request #4335 done by Mergify. Cherry-pick of 6cb5ebb681111a4984499f1f1a772d8c72db27dd has failed:
On branch mergify/bp/2.6.x/pr-4335
Your branch is up to date with 'origin/2.6.x'.
You are currently cherry-picking commit 6cb5ebb68.
(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/builtin/typelookup/TypeLookupManager.hpp
modified: include/fastdds/dds/builtin/typelookup/TypeLookupReplyListener.hpp
modified: include/fastdds/dds/builtin/typelookup/TypeLookupRequestListener.hpp
modified: src/cpp/fastdds/builtin/typelookup/TypeLookupReplyListener.cpp
modified: src/cpp/fastdds/builtin/typelookup/TypeLookupRequestListener.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/cpp/fastdds/builtin/typelookup/TypeLookupManager.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 refreshwill re-evaluate the rules -
@Mergifyio rebasewill rebase this PR on its base branch -
@Mergifyio updatewill 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
@irenebm would you mind taking a look at the conflicts ? Also, take advantage to rebase, so that we have both windows & mac on github working for this branch
@Mergifyio rebase 2.6.x
rebase 2.6.x
✅ Branch has been successfully rebased
@richiprosima please test this
@Mergifyio rebase 2.6.x
rebase 2.6.x
✅ Branch has been successfully rebased
@richiprosima please test this
Failed tests are unrelated to this PR, ready to merge !