Skip to content

Fix merge conflicts in #1653 humble backport - #1713

Merged
ahcorde merged 1 commit into
ros2:mergify/bp/humble/pr-1643from
nadavelkabets:mergify/bp/humble/pr-1643
Aug 21, 2026
Merged

Fix merge conflicts in #1653 humble backport#1713
ahcorde merged 1 commit into
ros2:mergify/bp/humble/pr-1643from
nadavelkabets:mergify/bp/humble/pr-1643

Conversation

@nadavelkabets

@nadavelkabets nadavelkabets commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

This PR fixes 2 issues in #1653 (backport of #1643)

  • executor.create_future() is not available in humble
  • test_create_task_during_spin is not part of the original PR and tests EventsExecutor which is not available in humble

Signed-off-by: Nadav Elkabets <elnadav12@gmail.com>
@nadavelkabets
nadavelkabets force-pushed the mergify/bp/humble/pr-1643 branch from de31e0c to eaf1e05 Compare August 21, 2026 10:30
@mergify

mergify Bot commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@ahcorde
ahcorde merged commit 060e799 into ros2:mergify/bp/humble/pr-1643 Aug 21, 2026
3 checks passed
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.

2 participants