Skip to content

Remove repeated header include & Fix log#5419

Merged
MiguelCompany merged 2 commits intomasterfrom
remove_repeated_header
Feb 21, 2025
Merged

Remove repeated header include & Fix log#5419
MiguelCompany merged 2 commits intomasterfrom
remove_repeated_header

Conversation

@cferreiragonz
Copy link
Copy Markdown
Contributor

@cferreiragonz cferreiragonz commented Nov 26, 2024 •
edited by MiguelCompany
Loading

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.

@cferreiragonz
Remove repeated header include
dc4abaa 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz added needs-review PR that is ready to be reviewed skip-ci Automatically pass CI labels Nov 26, 2024
@cferreiragonz cferreiragonz added this to the v3.2.0 milestone Nov 26, 2024
@cferreiragonz
Fix Log & comment
18a4c36 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz changed the title Remove repeated header include Remove repeated header include & Fix log Feb 12, 2025
@MiguelCompany MiguelCompany added no-test Skip CI tests if PR marked with this label and removed skip-ci Automatically pass CI labels Feb 21, 2025
@MiguelCompany MiguelCompany self-requested a review February 21, 2025 09:09
@github-actions github-actions bot added the ci-pending PR which CI is running label Feb 21, 2025
MiguelCompany
MiguelCompany approved these changes Feb 21, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green build

@MiguelCompany MiguelCompany removed the needs-review PR that is ready to be reviewed label Feb 21, 2025
@MiguelCompany MiguelCompany merged commit 1d8a6da into master Feb 21, 2025
13 checks passed
@MiguelCompany MiguelCompany deleted the remove_repeated_header branch February 21, 2025 11:14
@MiguelCompany
Copy link
Copy Markdown
Member

MiguelCompany commented Feb 21, 2025

@Mergifyio backport 3.1.x 2.14.x

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 21, 2025 •
edited
Loading

backport 3.1.x 2.14.x

✅ Backports have been created

Details

mergify bot pushed a commit that referenced this pull request Feb 21, 2025
@cferreiragonz @mergify
Remove repeated header include & Fix log (#5419)
6a227cb 
* Remove repeated header include

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Log & comment

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 1d8a6da)
@mergify mergify bot mentioned this pull request Feb 21, 2025
Merged
10 tasks
mergify bot pushed a commit that referenced this pull request Feb 21, 2025
@cferreiragonz @mergify
Remove repeated header include & Fix log (#5419)
ac1df23 
* Remove repeated header include

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Log & comment

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 1d8a6da)

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp
@mergify mergify bot mentioned this pull request Feb 21, 2025
Merged
10 tasks
MiguelCompany added a commit that referenced this pull request Mar 5, 2025
@mergify @cferreiragonz @MiguelCompany
Remove repeated header include & Fix log (#5419) (#5661)
c6bb8a4 
* Remove repeated header include & Fix log (#5419)

* Remove repeated header include

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Log & comment

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 1d8a6da)

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

+1 more reviewer

@gotorion gotorion gotorion approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ci-pending PR which CI is running no-test Skip CI tests if PR marked with this label

Projects

None yet

Milestone

v3.2.0 - Frozen ❄️

Development

Successfully merging this pull request may close these issues.

3 participants

@cferreiragonz @MiguelCompany @gotorion