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

Reduce number of controller_spawners to 3 (backport #919) #928

Merged
merged 1 commit into from
Apr 15, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 12, 2024

This is an automatic backport of pull request #919 done by Mergify.
Cherry-pick of 31993ab has failed:

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

You are currently cherry-picking commit 31993ab.
  (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:   ur_robot_driver/launch/ur_control.launch.py

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Feb 12, 2024
@fmauch fmauch removed the conflicts label Feb 26, 2024
Since the controller_spawner supports a list of controllers since a while we can use this to reduce the number of total controllers.

(cherry picked from commit 31993ab)
@fmauch fmauch merged commit 2d3c0a4 into humble Apr 15, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-919 branch April 15, 2024 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Relevant for humble and higher ROS versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant