Skip to content

[22353] Document new transmit_algorithms_as_legacy on builtin security plugins (backport #974)#975

Merged
MiguelCompany merged 2 commits into3.1.xfrom
mergify/bp/3.1.x/pr-974
Dec 13, 2024
Merged

[22353] Document new transmit_algorithms_as_legacy on builtin security plugins (backport #974)#975
MiguelCompany merged 2 commits into3.1.xfrom
mergify/bp/3.1.x/pr-974

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Dec 11, 2024

Description

This PR adds documentation for the new properties added in eProsima/Fast-DDS#5450

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • Code snippets related to the added documentation have been provided.
  • Documentation tests pass locally.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • CI passes without warnings or errors.
This is an automatic backport of pull request #974 done by [Mergify](https://mergify.com).

@MiguelCompany @mergify
Document new transmit_algorithms_as_legacy on builtin security plug…
1affe8e 
…ins (#974)

* Refs #19925. Add documentation of new property in PKIDH.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #19925. Add documentation of new property in Permissions.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Apply suggestions from code review

Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
(cherry picked from commit cc95496)

# Conflicts:
#	docs/fastdds/property_policies/security.rst
#	docs/fastdds/security/auth_plugin/auth_plugin.rst
@mergify mergify bot added the conflicts label Dec 11, 2024
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Dec 11, 2024

Cherry-pick of cc95496 has failed:

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

You are currently cherry-picking commit cc95496.
  (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/security/access_control_plugin/access_control_plugin.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/fastdds/property_policies/security.rst
	both modified:   docs/fastdds/security/auth_plugin/auth_plugin.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 Dec 11, 2024
Merged
8 tasks
@MiguelCompany MiguelCompany added this to the v3.1.1 milestone Dec 11, 2024
@MiguelCompany
Fix conflicts.
9e6f300 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany self-requested a review December 11, 2024 15:38
@MiguelCompany MiguelCompany merged commit f51a0de into 3.1.x Dec 13, 2024
@MiguelCompany MiguelCompany deleted the mergify/bp/3.1.x/pr-974 branch December 13, 2024 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees

No one assigned

Labels

ci-pending

Projects

None yet

Milestone

v3.1.1 - Frozen ❄️

Development

Successfully merging this pull request may close these issues.

1 participant

@MiguelCompany