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

[20119] TCP socket send buffer limit (backport #646) #655

Merged
merged 2 commits into from
Mar 13, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 6, 2024

This is an automatic backport of pull request #646 done by Mergify.
Cherry-pick of b74412f has failed:

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

You are currently cherry-picking commit b74412f.
  (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)

Changes to be committed:
	modified:   code/DDSCodeTester.cpp
	modified:   code/XMLTester.xml
	modified:   docs/fastdds/property_policies/non_consolidated_qos.rst
	modified:   docs/fastdds/transport/tcp/tcp.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/fastdds/rtps_layer/rtps_layer.rst

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 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

* Refs #20119: Add non_blocking_send to TCPTransportDescriptor

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: non_blocking_send moved to properties

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit b74412f)

# Conflicts:
#	docs/fastdds/rtps_layer/rtps_layer.rst
@mergify mergify bot added the conflicts label Feb 6, 2024
@JesusPoderoso JesusPoderoso added this to the v2.12.2 milestone Feb 6, 2024
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@elianalf
Copy link
Contributor

elianalf commented Mar 4, 2024

@elianalf elianalf merged commit 0d4b5b0 into 2.12.x Mar 13, 2024
4 checks passed
@elianalf elianalf deleted the mergify/bp/2.12.x/pr-646 branch March 13, 2024 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants