Skip to content

[23923] Ignore new RTPSParticipantAttributes#294

Merged
cferreiragonz merged 1 commit into
masterfrom
fix_rtps_attr_data_race
May 4, 2026
Merged

[23923] Ignore new RTPSParticipantAttributes#294
cferreiragonz merged 1 commit into
masterfrom
fix_rtps_attr_data_race

Conversation

@cferreiragonz
Copy link
Copy Markdown
Contributor

@cferreiragonz cferreiragonz commented Apr 28, 2026

Description

PR eProsima/Fast-DDS#6370 introduces new RTPSParticipantAttributes class. This PR ignores them similarly to the original one.

@Mergifyio backport 2.5.x 2.4.x 2.2.x 1.4.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A: Changes are API compatible.
  • : 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.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
Copy link
Copy Markdown

@raulojeda22 raulojeda22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cferreiragonz cferreiragonz requested review from richiprosima and removed request for richiprosima April 28, 2026 13:56
@github-actions github-actions Bot added the ci-pending PR which CI is running label Apr 28, 2026
@cferreiragonz cferreiragonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels May 4, 2026
@cferreiragonz cferreiragonz merged commit 99dc814 into master May 4, 2026
14 of 17 checks passed
@cferreiragonz cferreiragonz deleted the fix_rtps_attr_data_race branch May 4, 2026 10:47
@cferreiragonz
Copy link
Copy Markdown
Contributor Author

cferreiragonz commented Jun 2, 2026

@Mergifyio backport 2.4.x 2.2.x 1.4.x

@mergify
Copy link
Copy Markdown

mergify Bot commented Jun 2, 2026

backport 2.5.x 2.4.x 2.2.x 1.4.x

✅ Backports have been created

Details

Cherry-pick of 99dc814 has failed:

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

You are currently cherry-picking commit 99dc814.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i

no changes added to commit (use "git add" and/or "git commit -a")

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

cferreiragonz added a commit that referenced this pull request Jun 2, 2026
* Ignore new RTPSParticipantAttributes (#294)

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
(cherry picked from commit 99dc814)

# Conflicts:
#	fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i

* Solve conflicts

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>

---------

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Jun 2, 2026
(cherry picked from commit 99dc814)

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants