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

[20262] Fix wrong log info messages on TCP (backport #4258) #4314

Merged
merged 3 commits into from
Mar 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2024

This is an automatic backport of pull request #4258 done by Mergify.
Cherry-pick of 36f7f57 has failed:

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

You are currently cherry-picking commit 36f7f57b0.
  (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/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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 27, 2024
@mergify mergify bot mentioned this pull request Jan 27, 2024
10 tasks
@EduPonz EduPonz added this to the v2.6.8 milestone Jan 27, 2024
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jan 29, 2024
@Mario-DL
Copy link
Member

@jepemi would you mind rebasing this on top of 2.6.x?

jepemi and others added 3 commits February 23, 2024 13:05
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit ab94226)
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit 36f7f57)

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4258 branch from 8ad3fc7 to 55a8a44 Compare February 23, 2024 12:08
@jepemi jepemi changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4217 February 23, 2024 12:08
@jepemi
Copy link
Contributor

jepemi commented Feb 23, 2024

Base automatically changed from mergify/bp/2.6.x/pr-4217 to 2.6.x February 29, 2024 09:59
@Mario-DL
Copy link
Member

Mario-DL commented Mar 1, 2024

Most important failed tests were already addressed in #4275
Since it is a simple PR we can give it as ready if linux ci passes

@Mario-DL
Copy link
Member

Mario-DL commented Mar 1, 2024

@richiprosima please test linux

@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Mar 5, 2024
@EduPonz EduPonz merged commit 89b4f17 into 2.6.x Mar 6, 2024
8 of 13 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4258 branch March 6, 2024 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants