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

[20314] Update TCP documentation (backport #654) #665

Merged
merged 3 commits into from Apr 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 14, 2024

This is an automatic backport of pull request #654 done by Mergify.
Cherry-pick of 6c2c47a has failed:

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

You are currently cherry-picking commit 6c2c47a.
  (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:   docs/01-figures/TCP_WAN.png
	deleted:    docs/01-figures/TCP_WAN.svg

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   code/DDSCodeTester.cpp
	both modified:   code/XMLTester.xml
	both modified:   docs/fastdds/transport/tcp/tcp.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 #20314: Update TCP LAN example

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

* Refs #20314: Update TCP WAN example

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

* Refs #20314: Update TCP TLS example

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

* Refs #20314: Minor fixes

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

* Refs #20314: Extend WAN description, update image and modify examples

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

---------

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

# Conflicts:
#	code/DDSCodeTester.cpp
#	code/XMLTester.xml
#	docs/fastdds/transport/tcp/tcp.rst
@mergify mergify bot added the conflicts label Feb 14, 2024
@EduPonz EduPonz added this to the v2.6.8 milestone Feb 14, 2024
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@Mario-DL
Copy link
Member

@richiprosima please test docs

@Mario-DL
Copy link
Member

@jepemi Would you mind taking a look at this ?

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@Mario-DL Mario-DL merged commit c3204d9 into 2.6.x Apr 16, 2024
5 checks passed
@Mario-DL Mario-DL deleted the mergify/bp/2.6.x/pr-654 branch April 16, 2024 13:46
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.

None yet

3 participants