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

[MockHardware] Enable disabling of command to simulate HW failures. (backport #1027) #1050

Merged
merged 2 commits into from
Jun 8, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 5, 2023

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

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

You are currently cherry-picking commit bc8052a.
  (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:   hardware_interface/include/mock_components/generic_system.hpp
	modified:   hardware_interface/src/mock_components/generic_system.cpp
	modified:   hardware_interface/test/mock_components/test_generic_system.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hardware_interface/doc/mock_components_userdoc.rst

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

destogl added 2 commits June 7, 2023 23:02
…1027)

(cherry picked from commit bc8052a)

# Conflicts:
#	hardware_interface/doc/mock_components_userdoc.rst
@destogl destogl force-pushed the mergify/bp/humble/pr-1027 branch from 4baa342 to 12b56b5 Compare June 7, 2023 21:02
@destogl destogl merged commit a8aa03a into humble Jun 8, 2023
@destogl destogl deleted the mergify/bp/humble/pr-1027 branch June 8, 2023 04:55
flochre pushed a commit to flochre/ros2_control that referenced this pull request Jul 5, 2023
…backport ros-controls#1027) (ros-controls#1050)

* [MockHardware] Enable disabling of command to simulate HW failures. (ros-controls#1027)

(cherry picked from commit bc8052a)

# Conflicts:
#	hardware_interface/doc/mock_components_userdoc.rst

---------

Co-authored-by: Dr. Denis <[email protected]>
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.

1 participant