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

Add documentation on ros2_control_node and make lock_memory false by default (backport #1890) #1895

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

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2024

Related to ros-controls/ros2_controllers#1389


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

…y default (#1890)

(cherry picked from commit abb4c68)

# Conflicts:
#	controller_manager/src/ros2_control_node.cpp
Copy link
Contributor Author

mergify bot commented Nov 28, 2024

Cherry-pick of abb4c68 has failed:

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

You are currently cherry-picking commit abb4c68.
  (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/doc/userdoc.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/src/ros2_control_node.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 mergify bot added the conflicts label Nov 28, 2024
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