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

[20086] Methods to configure transport scenarios Documentation (backport #619) #633

Merged
merged 3 commits into from
Jan 17, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 19, 2023

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

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

You are currently cherry-picking commit b3bf26c.
  (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:   docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst
	modified:   docs/fastdds/env_vars/env_vars.rst
	modified:   docs/fastdds/rtps_layer/rtps_layer.rst
	modified:   docs/fastdds/transport/tcp/tcp.rst
	modified:   docs/fastdds/use_cases/tcp/tcp_with_multicast_discovery.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   code/CodeTester.cpp
	both modified:   code/XMLTester.xml
	both modified:   code/XMLTesterExample.xml
	both modified:   docs/03-exports/aliases-api.include
	both modified:   docs/fastdds/dds_layer/domain/domainParticipant/domainParticipant.rst
	both modified:   docs/fastdds/xml_configuration/domainparticipant.rst

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

@JesusPoderoso
Copy link
Contributor

Local run also reports test error in spelling but spelling folder is empty. Ready to merge @EduPonz?

JesusPoderoso
JesusPoderoso previously approved these changes Jan 12, 2024
@MiguelCompany
Copy link
Member

@Mergifyio rebase

cferreiragonz and others added 3 commits January 17, 2024 06:48
* Refs #20021: New TCP w/ Disc.Server example

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

* Refs #20021: fix XML example

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

* Refs #20021: Correct tests

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

* Refs #20021: Apply Revision's changes

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

* Refs #20021: Update use case and CLI

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

* Refs #20020: Add RTPS Attributes docs

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

* Refs #20020: Add XML builtin transports docs

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

* Refs #20020: Add new function reference

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

* Refs #20020: Add new environment variable docs

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

* Refs #20020: Add note in TrasnportConfigQos

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

* Refs #20020: Add new method of enabling TCP

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

* Refs #20020: Modify UDP+TCP use case

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

* Refs #20020: Minor fixes

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

* Refs #20020: Apply revision's changes and format table

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

* Refs #20020: Fix v6 missing

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

* Refs #20020: Remove v6 from builtin transports table

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

* Refs #20020: Apply revision's changes

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

* Refs #20020: Add Dedent

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

---------

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

# Conflicts:
#	code/CodeTester.cpp
#	code/XMLTester.xml
#	code/XMLTesterExample.xml
#	docs/03-exports/aliases-api.include
#	docs/fastdds/dds_layer/domain/domainParticipant/domainParticipant.rst
#	docs/fastdds/xml_configuration/domainparticipant.rst
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Copy link
Author

mergify bot commented Jan 17, 2024

rebase

✅ Branch has been successfully rebased

@JesusPoderoso JesusPoderoso merged commit 7d3d6cf into 2.6.x Jan 17, 2024
4 checks passed
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.6.x/pr-619 branch January 17, 2024 08:04
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.

4 participants