ros2 / rmw_fastrtps

Implementation of the ROS Middleware (rmw) Interface using eProsima's Fast RTPS.
Apache License 2.0
157 stars 117 forks source link

Take all available samples on service/client on_data_available. (backport #616) #623

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 2 years ago

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

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

You are currently cherry-picking commit e9abdc4.
  (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:   rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_client_info.hpp
    both modified:   rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_service_info.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](https://docs.mergify.com/). 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 ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com
fujitatomoya commented 2 years ago

@MiguelCompany can you resolve the conflict?

MiguelCompany commented 1 year ago

@quarkytale Yeah, that makes sense.

@fujitatomoya I don't have permissions on this repository, so either someone with permissions applies the changes suggested by @quarkytale, or I open a new PR with the correct code.

quarkytale commented 1 year ago

CI:

quarkytale commented 1 year ago

Retry Windows: Build Status