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

[20501] Improve large data docs (backport #698) #711

Merged
merged 4 commits into from
Mar 4, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 1, 2024

This is an automatic backport of pull request #698 done by Mergify.
Cherry-pick of 0e4aadb has failed:

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

You are currently cherry-picking commit 0e4aadb.
  (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/fastdds/use_cases/tcp/tcp_use_case.rst
	modified:   docs/fastdds/use_cases/use_cases.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/fastdds/use_cases/tcp/tcp_with_multicast_discovery.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 #20501: Add new entry to typical case of use & extend description

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

* Refs #20501: Change title and remove TODO

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 0e4aadb)

# Conflicts:
#	docs/fastdds/use_cases/tcp/tcp_with_multicast_discovery.rst
@mergify mergify bot added the conflicts label Mar 1, 2024
Copy link
Author

mergify bot commented Mar 1, 2024

Cherry-pick of 0e4aadb has failed:

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

You are currently cherry-picking commit 0e4aadb.
  (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/fastdds/use_cases/tcp/tcp_use_case.rst
	modified:   docs/fastdds/use_cases/use_cases.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/fastdds/use_cases/tcp/tcp_with_multicast_discovery.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 mergify bot mentioned this pull request Mar 1, 2024
8 tasks
@cferreiragonz cferreiragonz added this to the v2.10.4 milestone Mar 1, 2024
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
cferreiragonz
cferreiragonz previously approved these changes Mar 4, 2024
@cferreiragonz
Copy link
Contributor

@richiprosima please test docs

JesusPoderoso

This comment was marked as resolved.

Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
@cferreiragonz
Copy link
Contributor

@richiprosima please test docs

@JesusPoderoso JesusPoderoso merged commit e9f8119 into 2.10.x Mar 4, 2024
4 checks passed
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.10.x/pr-698 branch March 4, 2024 10:59
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