Skip to content

Add statistics for handle_loaned_message (backport #1927)#1933

Merged
fujitatomoya merged 2 commits intogalacticfrom
mergify/bp/galactic/pr-1927
Jun 9, 2022
Merged

Add statistics for handle_loaned_message (backport #1927)#1933
fujitatomoya merged 2 commits intogalacticfrom
mergify/bp/galactic/pr-1927

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 19, 2022

This is an automatic backport of pull request #1927 done by Mergify.
Cherry-pick of 5c68830 has failed:

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

You are currently cherry-picking commit 5c688303.
  (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:   rclcpp/include/rclcpp/subscription.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

@Barry-Xu-2018 @mergify
Add statistics for handle_loaned_message (#1927)
639c665 
* Add statistics for handle_loaned_message

Signed-off-by: Barry Xu <barry.xu@sony.com>
(cherry picked from commit 5c68830)

# Conflicts:
#	rclcpp/include/rclcpp/subscription.hpp
@mergify mergify bot added the conflicts label May 19, 2022
@mergify mergify bot mentioned this pull request May 19, 2022
Merged
fujitatomoya
fujitatomoya reviewed May 19, 2022
View reviewed changes
Copy link
Copy Markdown
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.

@Barry-Xu-2018 template is different from humble, can you address the conflict?

@Barry-Xu-2018
Copy link
Copy Markdown
Collaborator

Barry-Xu-2018 commented May 20, 2022

@Barry-Xu-2018 template is different from humble, can you address the conflict?

I will fix it.

@Barry-Xu-2018
Copy link
Copy Markdown
Collaborator

Barry-Xu-2018 commented May 20, 2022

@fujitatomoya

I created a commit to fix this merge conflicts.
Barry-Xu-2018@47b892e

But I don't know to apply my fix.
I have no permission to push commit to this branch mergify/bp/galactic/pr-1927.

@clalancette
Copy link
Copy Markdown
Contributor

clalancette commented May 20, 2022

But I don't know to apply my fix.
I have no permission to push commit to this branch mergify/bp/galactic/pr-1927.

You should be able to make a PR that targets this PR. Then we can merge it into this PR before doing the final review and test.

@Barry-Xu-2018
Copy link
Copy Markdown
Collaborator

Barry-Xu-2018 commented May 20, 2022

But I don't know to apply my fix.
I have no permission to push commit to this branch mergify/bp/galactic/pr-1927.

You should be able to make a PR that targets this PR. Then we can merge it into this PR before doing the final review and test.

Get it. Thank you @clalancette

@Barry-Xu-2018 Barry-Xu-2018 mentioned this pull request May 20, 2022
Merged
@Barry-Xu-2018
Fix merge conflicts (#1938)
df17e7f 
Signed-off-by: Barry Xu <barry.xu@sony.com>
@fujitatomoya fujitatomoya mentioned this pull request May 20, 2022
Merged
@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Jun 9, 2022

CI:

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

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Jun 9, 2022

CI: sorry repo file path is not correct.

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

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Jun 9, 2022

all green, i will go ahead to merge this.

@fujitatomoya fujitatomoya merged commit 206e0fd into galactic Jun 9, 2022
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/galactic/pr-1927 branch June 9, 2022 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fujitatomoya fujitatomoya fujitatomoya approved these changes

Assignees

@fujitatomoya fujitatomoya

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Barry-Xu-2018 @clalancette @fujitatomoya