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

[20410] Remove Data-Sharing option (backport #100) #104

Merged
merged 1 commit into from Mar 19, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 19, 2024

Shapes Demo has never worked in data-sharing mode (because the Shape type contains an unbounded string).
This PR removes the data-sharing option from the documentation, as it is never used.

@Mergifyio backport 2.6.x 2.10.x 2.12.x 2.13.x

Related implementation PR:

* Refs #20410: Remove Data-Sharing option

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20410: Apply rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20410: Fix ROS image

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 57f1a58)

# Conflicts:
#	docs/01-figures/participant.png
#	docs/01-figures/participant_ros_enabled.png
#	docs/01-figures/tcp_client_options.png
#	docs/01-figures/tcp_lan_server_options.png
#	docs/01-figures/tcp_wan_server_options.png
@mergify mergify bot added the conflicts label Mar 19, 2024
Copy link
Author

mergify bot commented Mar 19, 2024

Cherry-pick of 57f1a58 has failed:

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

You are currently cherry-picking commit 57f1a58.
  (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/first_steps/first_steps.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/01-figures/participant.png
	both modified:   docs/01-figures/participant_ros_enabled.png
	both modified:   docs/01-figures/tcp_client_options.png
	both modified:   docs/01-figures/tcp_lan_server_options.png
	both modified:   docs/01-figures/tcp_wan_server_options.png

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

@richiprosima
Copy link

Build status: Build Status

@elianalf elianalf added this to the v2.12.2 milestone Mar 19, 2024
@elianalf elianalf merged commit 2ce1dde into 2.12.x Mar 19, 2024
4 checks passed
@elianalf elianalf deleted the mergify/bp/2.12.x/pr-100 branch March 19, 2024 15:36
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