Skip to content

rcl_send_response returns RCL_RET_TIMEOUT. (backport #1048)#1091

Merged
fujitatomoya merged 2 commits intohumblefrom
mergify/bp/humble/pr-1048
Sep 1, 2023
Merged

rcl_send_response returns RCL_RET_TIMEOUT. (backport #1048)#1091
fujitatomoya merged 2 commits intohumblefrom
mergify/bp/humble/pr-1048

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Aug 18, 2023

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

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

You are currently cherry-picking commit c7b394a.
  (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:   rcl/include/rcl/service.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rcl/src/rcl/service.c

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

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit c7b394a)

# Conflicts:
#	rcl/src/rcl/service.c
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
@fujitatomoya fujitatomoya self-assigned this Aug 31, 2023
@fujitatomoya
Copy link
Copy Markdown
Collaborator

CI:

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

@fujitatomoya
Copy link
Copy Markdown
Collaborator

https://ci.ros2.org/job/ci_windows/20155/testReport/ is unrelated to those changes.

@fujitatomoya fujitatomoya merged commit 887e696 into humble Sep 1, 2023
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-1048 branch September 1, 2023 15:25
mauropasse pushed a commit to mauropasse/rcl that referenced this pull request Oct 18, 2023
…#1091)

* rcl_send_response returns RCL_RET_TIMEOUT. (ros2#1048)

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit c7b394a)

# Conflicts:
#	rcl/src/rcl/service.c

* fix conflict with service introspection.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
alsora added a commit to irobot-ros/rcl that referenced this pull request Oct 18, 2023
rcl_send_response returns RCL_RET_TIMEOUT. (backport ros2#1048) (ros2#1091)
mauropasse pushed a commit to mauropasse/rcl that referenced this pull request Oct 18, 2023
…#1091)

* rcl_send_response returns RCL_RET_TIMEOUT. (ros2#1048)

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit c7b394a)

# Conflicts:
#	rcl/src/rcl/service.c

* fix conflict with service introspection.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
alsora added a commit to irobot-ros/rcl that referenced this pull request Oct 18, 2023
rcl_send_response returns RCL_RET_TIMEOUT. (backport ros2#1048) (ros2#1091)
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