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 diagnostics (backport #820) #922

Merged
merged 2 commits into from
Jan 24, 2023
Merged

Add diagnostics (backport #820) #922

merged 2 commits into from
Jan 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2023

This is an automatic backport of pull request #820 done by Mergify.
Cherry-pick of b1f31a1 has failed:

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

You are currently cherry-picking commit b1f31a1.
  (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/CMakeLists.txt
	modified:   controller_manager/include/controller_manager/controller_manager.hpp
	modified:   controller_manager/package.xml

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/github/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

(cherry picked from commit b1f31a1)

# Conflicts:
#	controller_manager/src/controller_manager.cpp
@bmagyar bmagyar removed the conflicts label Jan 24, 2023
Copy link
Member

@destogl destogl left a comment

Choose a reason for hiding this comment

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

This is ABi breaking, just to know... but agree very much.

@destogl destogl merged commit dca10f4 into humble Jan 24, 2023
@mergify mergify bot deleted the mergify/bp/humble/pr-820 branch January 24, 2023 21:48
schornakj added a commit to schornakj/ros2_control that referenced this pull request May 8, 2023
This reverts commit dca10f4.

Signed-off-by: Joe Schornak <joe.schornak@gmail.com>
schornakj added a commit to PickNikRobotics/ros2_control that referenced this pull request May 8, 2023
This reverts commit dca10f4.

Signed-off-by: Joe Schornak <joe.schornak@gmail.com>
pac48 pushed a commit to pac48/ros2_control that referenced this pull request Jan 26, 2024
…ls#922)

* Update list of reviewers (ros-controls#884)

(cherry picked from commit 0a96cbb513282880d2d64adfb8c3c8c0ffc84b5b)

# Conflicts:
#	.github/reviewer-lottery.yml

* Update reviewer-lottery.yml

---------

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
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.

None yet

2 participants