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

Fix liveliness crash that causes rmw_zenoh crash in debug mode (backport #544) #550

Open
wants to merge 1 commit into
base: humble
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 15, 2025

This PR makes the following changes of commit ids:

zenoh-cpp from 2a127bb to 8ad67f6, zenoh-c from 3540a3c to e6a1971, and zenoh from f735bf5 to b661454

It inherits these changes:


This is an automatic backport of pull request #544 done by [Mergify](https://mergify.com).

…0a3c to e6a1971, and zenoh from f735bf5 to b661454 (#544)

(cherry picked from commit ea63b21)

# Conflicts:
#	zenoh_cpp_vendor/CMakeLists.txt
@mergify mergify bot added the conflicts label Mar 15, 2025
Copy link
Author

mergify bot commented Mar 15, 2025

Cherry-pick of ea63b21 has failed:

On branch mergify/bp/humble/pr-544
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit ea63b21.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   zenoh_cpp_vendor/CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant