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

Initialize the controller manager services after initializing resource manager (backport #1271) #1278

Merged
merged 2 commits into from
Jan 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2024

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

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

You are currently cherry-picking commit bdad009.
  (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/test/test_hardware_management_srvs.cpp

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

…e manager (#1271)

(cherry picked from commit bdad009)

# Conflicts:
#	controller_manager/src/controller_manager.cpp
@mergify mergify bot added the conflicts label Jan 8, 2024
Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

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

Fixing conflicts

controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
Co-authored-by: Sai Kishor Kothakota <sai.kishor@pal-robotics.com>
@bmagyar bmagyar merged commit 9387936 into iron Jan 8, 2024
12 checks passed
@mergify mergify bot deleted the mergify/bp/iron/pr-1271 branch January 8, 2024 18:37
HovorunB added a commit to pixel-robotics/ros2_control that referenced this pull request Jan 17, 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.

2 participants