Closed mergify[bot] closed 3 months ago
Cherry-pick of 0571391b594ef047b80e58f732da7e6531dbcd24 has failed:
On branch mergify/bp/2.6.x/pr-4807
Your branch is up to date with 'origin/2.6.x'.
You are currently cherry-picking commit 0571391b5.
(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: include/fastdds/rtps/writer/RTPSWriter.h
modified: src/cpp/rtps/participant/RTPSParticipantImpl.h
modified: src/cpp/rtps/writer/RTPSWriter.cpp
modified: test/blackbox/common/RTPSBlackboxTestsBasic.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/cpp/rtps/participant/RTPSParticipantImpl.cpp
both modified: test/blackbox/common/DDSBlackboxTestsBasic.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
@elianalf would you mind addressing the conflicts here ?
@richiprosima please test discovery-server
I have ordered another windows rerun to assure that the two failed tests are not deterministic
Description
This PR adds the parsing of
max_message_size
property in RTPS Writer and RTPS Participant.@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x
Contributor Checklist
versions.md
file (if applicable).Reviewer Checklist
This is an automatic backport of pull request #4777 done by Mergify.
This is an automatic backport of pull request #4807 done by Mergify.