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

Update controller_manager_plugin.cpp (backport #3179) #3235

Merged
merged 3 commits into from
Jan 13, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 12, 2025

Fixing the bug where the namespace is not properly applied when using Ros2ControlMultiManager

Description

When using two ROS2 controls, the namespace is automatically detected, but the namespace is not properly applied when registering the action client.

For more details, please refer to #3150


This is an automatic backport of pull request #3179 done by Mergify.

Fixing the bug where the namespace is not properly applied when using Ros2ControlMultiManager

Co-authored-by: Sebastian Jahr <[email protected]>
(cherry picked from commit 2566467)

# Conflicts:
#	moveit_plugins/moveit_ros_control_interface/src/controller_manager_plugin.cpp
@mergify mergify bot added the conflicts label Jan 12, 2025
Copy link
Author

mergify bot commented Jan 12, 2025

Cherry-pick of 2566467 has failed:

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

You are currently cherry-picking commit 256646748.
  (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:   moveit_plugins/moveit_ros_control_interface/src/controller_manager_plugin.cpp

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

@sea-bass sea-bass requested review from JafarAbdi and sjahr January 12, 2025 17:38
@sjahr sjahr enabled auto-merge (squash) January 13, 2025 07:50
@codecov-commenter
Copy link

codecov-commenter commented Jan 13, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.41%. Comparing base (4ad2d10) to head (217ae23).
Report is 1 commits behind head on humble.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #3235      +/-   ##
==========================================
- Coverage   51.41%   51.41%   -0.00%     
==========================================
  Files         382      382              
  Lines       31893    31893              
==========================================
- Hits        16396    16395       -1     
- Misses      15497    15498       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sjahr sjahr merged commit c705c2c into humble Jan 13, 2025
7 checks passed
@sjahr sjahr deleted the mergify/bp/humble/pr-3179 branch January 13, 2025 08:32
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.

3 participants