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

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

Merged
merged 2 commits into from
May 17, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 27, 2022

This is an automatic backport of pull request #616 done by Mergify.
Cherry-pick of e9abdc4 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.

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: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit e9abdc4)

# Conflicts:
#	rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_client_info.hpp
#	rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_service_info.hpp
@fujitatomoya
Copy link
Collaborator

@MiguelCompany can you resolve the conflict?

Copy link

@quarkytale quarkytale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fujitatomoya @MiguelCompany does this make sense?

@MiguelCompany
Copy link
Collaborator

@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.

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

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@quarkytale @MiguelCompany pushed suggested fix by @quarkytale , can you do review just in case?

@quarkytale
Copy link

CI:

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

@quarkytale
Copy link

Retry Windows:
Build Status

@quarkytale quarkytale merged commit 3c2c5b3 into foxy May 17, 2023
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/foxy/pr-616 branch May 17, 2023 03:52
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.

3 participants