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

Use portable versio for usleep #237

Merged
merged 1 commit into from
Feb 14, 2024
Merged

Conversation

ahcorde
Copy link
Collaborator

@ahcorde ahcorde commented Feb 14, 2024

Related with this PR in gazebo_ros2_control ros-controls/gazebo_ros2_control#286

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde ahcorde self-assigned this Feb 14, 2024
@ahcorde ahcorde merged commit 0bdf13e into master Feb 14, 2024
8 checks passed
@ahcorde ahcorde deleted the ahcorde/rolling/portable_sleep branch February 14, 2024 09:33
@ahcorde
Copy link
Collaborator Author

ahcorde commented Feb 14, 2024

https://github.com/Mergifyio backport humble iron

Copy link
Contributor

mergify bot commented Feb 14, 2024

backport humble iron

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Feb 14, 2024
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 0bdf13e)
mergify bot pushed a commit that referenced this pull request Feb 14, 2024
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 0bdf13e)

# Conflicts:
#	ign_ros2_control/src/ign_ros2_control_plugin.cpp
ahcorde added a commit that referenced this pull request Feb 14, 2024
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 0bdf13e)

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
ahcorde added a commit that referenced this pull request Feb 14, 2024
* Use portable versio for usleep (#237)

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 0bdf13e)

# Conflicts:
#	ign_ros2_control/src/ign_ros2_control_plugin.cpp

* fixed merge

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

---------

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.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