Skip to content

Use OnShutdown callback handle instead of OnShutdown callback (backport #1639)#1651

Closed
mergify[bot] wants to merge 1 commit intofoxyfrom
mergify/bp/foxy/pr-1639
Closed

Use OnShutdown callback handle instead of OnShutdown callback (backport #1639)#1651
mergify[bot] wants to merge 1 commit intofoxyfrom
mergify/bp/foxy/pr-1639

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 30, 2021

This is an automatic backport of pull request #1639 done by Mergify.
Cherry-pick of 6806cdf has failed:

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

You are currently cherry-picking commit 6806cdf8.
  (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:   rclcpp/include/rclcpp/context.hpp
	modified:   rclcpp/src/rclcpp/context.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclcpp/include/rclcpp/executor.hpp
	both modified:   rclcpp/src/rclcpp/executor.cpp

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

1. Add remove_on_shutdown_callback() in rclcpp::Context

Signed-off-by: Barry Xu <barry.xu@sony.com>

2. Add add_on_shutdown_callback(), which returns a handle that can be removed by remove_on_shutdown_callback().

Signed-off-by: Barry Xu <barry.xu@sony.com>
(cherry picked from commit 6806cdf)

# Conflicts:
#	rclcpp/include/rclcpp/executor.hpp
#	rclcpp/src/rclcpp/executor.cpp
@ivanpauno
Copy link
Copy Markdown
Member

I opened this one unintentionally, I only wanted a backport for galactic

@ivanpauno ivanpauno closed this Apr 30, 2021
@mergify mergify bot deleted the mergify/bp/foxy/pr-1639 branch April 30, 2021 17:55
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