Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 3, 2026

Description

Minor update to complete TODOs.

Fixes # (issue)

Is this user-facing behavior change?

Did you use Generative AI?

Additional Information


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

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 4dcd184)

# Conflicts:
#	zenoh_security_tools/CMakeLists.txt
#	zenoh_security_tools/package.xml
@mergify mergify bot added the conflicts label Feb 3, 2026
@mergify
Copy link
Author

mergify bot commented Feb 3, 2026

Cherry-pick of 4dcd184 has failed:

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

You are currently cherry-picking commit 4dcd184.
  (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:   rmw_zenoh_cpp/src/detail/liveliness_utils.cpp
	modified:   rmw_zenoh_cpp/src/detail/rmw_node_data.cpp
	modified:   rmw_zenoh_cpp/src/rmw_zenoh.cpp

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

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 mergify bot mentioned this pull request Feb 3, 2026
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
@fujitatomoya
Copy link
Contributor

Pulls: #905
Gist: https://gist.githubusercontent.com/fujitatomoya/cb51910b1586f99b93c237dc14b6eb41/raw/cfbb0029666c4c462ea2a435598f7ebc1f52462f/ros2.repos
BUILD args: --packages-above-and-dependencies rmw_zenoh_cpp zenoh_security_tools
TEST args: --packages-above rmw_zenoh_cpp zenoh_security_tools
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/18113

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde ahcorde closed this Feb 4, 2026
@ahcorde ahcorde reopened this Feb 4, 2026
@ahcorde ahcorde marked this pull request as draft February 4, 2026 13:30
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.

2 participants