Correct reporting of MatchedStatus last_*_handle [13786] (backport #2544)#2547
Merged
MiguelCompany merged 2 commits into2.4.xfrom Mar 3, 2022
Merged
Correct reporting of MatchedStatus last_*_handle [13786] (backport #2544)#2547MiguelCompany merged 2 commits into2.4.xfrom
MiguelCompany merged 2 commits into2.4.xfrom
Conversation
* Refs 13786: Add test for MatchedStatus last_*_handle Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> * Refs 13786: Correct reporting of MatchedStatus last_*_handle Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> (cherry picked from commit ba01ca6) # Conflicts: # test/blackbox/api/dds-pim/PubSubReader.hpp # test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
13 tasks
Member
|
@EduPonz Would you mind fixing conflicts here? |
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #2544 done by Mergify.
Cherry-pick of ba01ca6 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com