Skip to content

Remove repeated header include & Fix log (backport #5419) #5661

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

Merged
merged 2 commits into from
Mar 5, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2025

Description

@Mergifyio backport 3.1.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A The code follows the style guidelines of this project.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5419 done by [Mergify](https://mergify.com).

* Remove repeated header include

Signed-off-by: cferreiragonz <[email protected]>

* Fix Log & comment

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 1d8a6da)

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 21, 2025
Copy link
Contributor Author

mergify bot commented Feb 21, 2025

Cherry-pick of 1d8a6da has failed:

On branch mergify/bp/2.14.x/pr-5419
Your branch is up to date with 'origin/2.14.x'.

You are currently cherry-picking commit 1d8a6da6.
  (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:   src/cpp/rtps/transport/TCPTransportInterface.cpp

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 Feb 21, 2025
10 tasks
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany added this to the v2.14.5 milestone Feb 21, 2025
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Feb 21, 2025
@EugenioCollado EugenioCollado self-requested a review February 27, 2025 15:28
@github-actions github-actions bot added the ci-pending PR which CI is running label Feb 27, 2025
@MiguelCompany MiguelCompany merged commit c6bb8a4 into 2.14.x Mar 5, 2025
18 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.14.x/pr-5419 branch March 5, 2025 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants