Skip to content

Fix the initialization of the parsed resource managers#3346

Merged
saikishor merged 4 commits into
ros-controls:masterfrom
pal-robotics-forks:fix/inherited/resource_managers
May 22, 2026
Merged

Fix the initialization of the parsed resource managers#3346
saikishor merged 4 commits into
ros-controls:masterfrom
pal-robotics-forks:fix/inherited/resource_managers

Conversation

@saikishor

@saikishor saikishor commented May 21, 2026

Copy link
Copy Markdown
Member

Should fix failing CI of gz_ros2_control introduced with #2775

@saikishor saikishor marked this pull request as ready for review May 22, 2026 12:11
@github-actions github-actions Bot requested review from bijoua29 and erickisos May 22, 2026 12:11

@christophfroehlich christophfroehlich left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue seems to be fixed, thank you!

@saikishor saikishor merged commit a29fa97 into ros-controls:master May 22, 2026
19 of 28 checks passed
@saikishor saikishor deleted the fix/inherited/resource_managers branch May 22, 2026 21:29
@christophfroehlich christophfroehlich added the backport-kilted Triggers PR backport to ROS 2 kilted. label Jul 13, 2026
@christophfroehlich

Copy link
Copy Markdown
Member

@Mergifyio backport mergify/bp/jazzy/pr-2775

@mergify

mergify Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

backport mergify/bp/jazzy/pr-2775

✅ Backports have been created

Details

Cherry-pick of a29fa97 has failed:

On branch mergify/bp/mergify/bp/jazzy/pr-2775/pr-3346
Your branch is up to date with 'origin/mergify/bp/jazzy/pr-2775'.

You are currently cherry-picking commit a29fa97.
  (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:   controller_manager/include/controller_manager/controller_manager.hpp
	modified:   controller_manager/test/test_controller_manager_with_resource_manager.cpp
	modified:   hardware_interface/src/resource_manager.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/src/controller_manager.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

christophfroehlich pushed a commit that referenced this pull request Jul 13, 2026
Co-authored-by: Sai Kishor Kothakota <sai.kishor@pal-robotics.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-kilted Triggers PR backport to ROS 2 kilted.

Projects

None yet

2 participants