Skip to content

Switch lifecycle to use the RCLCPP macros. (backport #2233)#2244

Merged
clalancette merged 2 commits intoironfrom
mergify/bp/iron/pr-2233
Jul 24, 2023
Merged

Switch lifecycle to use the RCLCPP macros. (backport #2233)#2244
clalancette merged 2 commits intoironfrom
mergify/bp/iron/pr-2233

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 24, 2023

This is an automatic backport of pull request #2233 done by Mergify.
Cherry-pick of 945d254 has failed:

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

You are currently cherry-picking commit 945d254e.
  (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:   rclcpp_lifecycle/src/lifecycle_node.cpp
	both modified:   rclcpp_lifecycle/src/lifecycle_node_interface_impl.cpp
	both modified:   rclcpp_lifecycle/src/lifecycle_node_interface_impl.hpp

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

This ensures that they'll go out to /rosout and the disk.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 945d254)

# Conflicts:
#	rclcpp_lifecycle/src/lifecycle_node.cpp
#	rclcpp_lifecycle/src/lifecycle_node_interface_impl.cpp
#	rclcpp_lifecycle/src/lifecycle_node_interface_impl.hpp
Signed-off-by: Chris Lalancette <clalancette@gmail.com>
@clalancette
Copy link
Copy Markdown
Contributor

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@clalancette clalancette merged commit 7b7531b into iron Jul 24, 2023
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/iron/pr-2233 branch July 24, 2023 15:54
nachovizzo pushed a commit to nachovizzo/rclcpp that referenced this pull request Oct 3, 2023
…#2244)

* Switch lifecycle to use the RCLCPP macros. (ros2#2233)

This ensures that they'll go out to /rosout and the disk.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 945d254)
Signed-off-by: Ignacio Vizzo <ignacio@dexory.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.

1 participant