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

[20504] Just show warning when inconsistency between depth and max_samples_per_instance (backport #4417) #4440

Merged
merged 1 commit into from
Feb 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2024

This is an automatic backport of pull request #4417 done by Mergify.
Cherry-pick of 12201f4 has failed:

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

You are currently cherry-picking commit 12201f461.
  (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:   src/cpp/fastdds/publisher/DataWriterImpl.cpp
	modified:   src/cpp/fastdds/subscriber/DataReaderImpl.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsDataReader.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsDataWriter.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/dds/publisher/DataWriterTests.cpp
	both modified:   test/unittest/dds/subscriber/DataReaderTests.cpp

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 23, 2024
@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Feb 23, 2024
@EduPonz
Copy link

EduPonz commented Feb 23, 2024

@clalancette this should fix iron from sources as well. Fortunately, the previous PR did not get merged in 2.6mx before we caught it.

…r_instance (#4417)

* Refs #20503. Add regression test

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20503. Show warning when depth > max_samples_per_instance

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20503. Fix InvalidQos tests

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 12201f4)
@EduPonz EduPonz added first-to-merge and removed conflicts Backport PR wich git cherry pick failed labels Feb 23, 2024
@EduPonz
Copy link

EduPonz commented Feb 23, 2024

@richiprosima please test this

@EduPonz EduPonz merged commit e205104 into 2.10.x Feb 23, 2024
10 of 15 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.10.x/pr-4417 branch February 23, 2024 21:51
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