Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 29, 2025

Splitting the work created from @mjcarroll in #502. This is tweaking the header files under gz/transport.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.


This is an automatic backport of pull request #642 done by Mergify.

Signed-off-by: Carlos Agüero <caguero@osrfoundation.org>
(cherry picked from commit bd39167)

# Conflicts:
#	include/gz/transport/HandlerStorage.hh
#	include/gz/transport/Helpers.hh
#	include/gz/transport/MessageInfo.hh
#	include/gz/transport/NetUtils.hh
#	include/gz/transport/Node.hh
#	include/gz/transport/NodeOptions.hh
#	include/gz/transport/NodeShared.hh
#	include/gz/transport/Publisher.hh
#	include/gz/transport/RepHandler.hh
#	include/gz/transport/ReqHandler.hh
#	include/gz/transport/SubscribeOptions.hh
#	include/gz/transport/SubscriptionHandler.hh
#	include/gz/transport/TopicStatistics.hh
#	include/gz/transport/TopicStorage.hh
#	include/gz/transport/TopicUtils.hh
#	include/gz/transport/TransportTypes.hh
#	include/gz/transport/Uuid.hh
@mergify mergify bot added the conflicts label May 29, 2025
@mergify mergify bot requested a review from caguero as a code owner May 29, 2025 12:31
Copy link
Contributor Author

mergify bot commented May 29, 2025

Cherry-pick of bd39167 has failed:

On branch mergify/bp/ign-transport11/pr-642
Your branch is up to date with 'origin/ign-transport11'.

You are currently cherry-picking commit bd39167.
  (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:   include/gz/transport/HandlerStorage.hh
	both modified:   include/gz/transport/Helpers.hh
	both modified:   include/gz/transport/MessageInfo.hh
	both modified:   include/gz/transport/NetUtils.hh
	both modified:   include/gz/transport/Node.hh
	both modified:   include/gz/transport/NodeOptions.hh
	both modified:   include/gz/transport/NodeShared.hh
	both modified:   include/gz/transport/Publisher.hh
	both modified:   include/gz/transport/RepHandler.hh
	both modified:   include/gz/transport/ReqHandler.hh
	both modified:   include/gz/transport/SubscribeOptions.hh
	both modified:   include/gz/transport/SubscriptionHandler.hh
	both modified:   include/gz/transport/TopicStatistics.hh
	both modified:   include/gz/transport/TopicStorage.hh
	both modified:   include/gz/transport/TopicUtils.hh
	both modified:   include/gz/transport/TransportTypes.hh
	both modified:   include/gz/transport/Uuid.hh

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request May 29, 2025
8 tasks
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label May 29, 2025
Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Jun 4, 2025
@caguero caguero merged commit 71eebca into ign-transport11 Jun 4, 2025
10 checks passed
@caguero caguero deleted the mergify/bp/ign-transport11/pr-642 branch June 4, 2025 15:26
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Jun 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant