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

[20311] Add missing TypeLookup listeners (backport #4335) #4438

Merged
merged 1 commit into from
Apr 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2024

This is an automatic backport of pull request #4335 done by Mergify.
Cherry-pick of 6cb5ebb 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 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 22, 2024
@mergify mergify bot mentioned this pull request Feb 22, 2024
11 tasks
@EduPonz EduPonz added this to the v2.6.8 milestone Feb 22, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Feb 23, 2024

@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

@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Feb 24, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Mar 7, 2024

@Mergifyio rebase 2.6.x

Copy link
Contributor Author

mergify bot commented Mar 7, 2024

rebase 2.6.x

✅ Branch has been successfully rebased

@Mario-DL
Copy link
Member

Mario-DL commented Mar 7, 2024

@richiprosima please test this

@Mario-DL
Copy link
Member

Mario-DL commented Apr 2, 2024

@Mergifyio rebase 2.6.x

* Add listener classes to handle cache change acknowledgments

Signed-off-by: Irene Bandera <[email protected]>

* Uncrustify

Signed-off-by: Irene Bandera <[email protected]>

* Fix memory leaks in TypeLookupManager.cpp

* Apply changes

Signed-off-by: Irene Bandera <[email protected]>

* Apply changes

Signed-off-by: Irene Bandera <[email protected]>

* Refs #20311: Further refactor TypeLookupManager::create_endpoints

Signed-off-by: EduPonz <[email protected]>

---------

Signed-off-by: Irene Bandera <[email protected]>
Signed-off-by: EduPonz <[email protected]>
Co-authored-by: EduPonz <[email protected]>
Copy link
Contributor Author

mergify bot commented Apr 2, 2024

rebase 2.6.x

✅ Branch has been successfully rebased

@Mario-DL Mario-DL self-requested a review April 2, 2024 06:10
@Mario-DL
Copy link
Member

Mario-DL commented Apr 2, 2024

@richiprosima please test this

@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Apr 4, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Apr 4, 2024

Failed tests are unrelated to this PR, ready to merge !

@EduPonz EduPonz merged commit 6a45117 into 2.6.x Apr 4, 2024
10 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4335 branch April 4, 2024 12:43
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.

3 participants