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

Added spawner colours to list_controllers depending upon active or inactive (backport #1409) #1424

Merged
merged 2 commits into from
Mar 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 29, 2024

This is an automatic backport of pull request #1409 done by Mergify.
Cherry-pick of 0711cd6 has failed:

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

You are currently cherry-picking commit 0711cd6.
  (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:   ros2controlcli/ros2controlcli/verb/list_controllers.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

…inactive (#1409)

(cherry picked from commit 0711cd6)

# Conflicts:
#	ros2controlcli/ros2controlcli/verb/list_controllers.py
@mergify mergify bot added the conflicts label Feb 29, 2024
Copy link
Contributor Author

mergify bot commented Feb 29, 2024

Cherry-pick of 0711cd6 has failed:

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

You are currently cherry-picking commit 0711cd6.
  (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:   ros2controlcli/ros2controlcli/verb/list_controllers.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

@bmagyar bmagyar merged commit e3391da into humble Mar 1, 2024
13 of 14 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-1409 branch March 1, 2024 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants