Closed mergify[bot] closed 3 weeks ago
Cherry-pick of e6044e01172525295733737e574e69f74ff507ca has failed:
On branch mergify/bp/2.10.x/pr-4893
Your branch is up to date with 'origin/2.10.x'.
You are currently cherry-picking commit e6044e011.
(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/dds/core/policy/QosPolicies.hpp
modified: include/fastdds/rtps/attributes/WriterAttributes.h
modified: include/fastrtps/xmlparser/XMLParser.h
modified: include/fastrtps/xmlparser/XMLParserCommon.h
modified: src/cpp/rtps/participant/RTPSParticipantImpl.cpp
modified: src/cpp/rtps/xmlparser/XMLElementParser.cpp
modified: src/cpp/rtps/xmlparser/XMLParser.cpp
modified: src/cpp/rtps/xmlparser/XMLParserCommon.cpp
modified: test/unittest/dds/publisher/PublisherTests.cpp
modified: test/unittest/xmlparser/XMLElementParserTests.cpp
modified: test/unittest/xmlparser/XMLParserTests.cpp
modified: test/unittest/xmlparser/test_xml_deprecated.xml
modified: test/unittest/xmlparser/test_xml_rooted_deprecated.xml
modified: test/unittest/xmlparser/wrapper/XMLParserTest.hpp
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp
both modified: resources/xsd/fastRTPS_profiles.xsd
both modified: test/unittest/dds/profiles/test_xml_for_string_profile.xml
both modified: test/unittest/dds/profiles/test_xml_profile.xml
both modified: test/unittest/xmlparser/XMLProfileParserTests.cpp
both modified: test/unittest/xmlparser/test_xml_profile.xml
deleted by us: test/unittest/xmlparser/test_xml_profile_env_var.xml
both modified: versions.md
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
Docs associated PR:
Description
This PR is a partial backport from #4837 that brings the XML configuration of the FLow Controller Descriptor List. In
2.x
bothThroughtputController
andFlowcontrollerDescriptor
coexist.@Mergifyio backport 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 #4893 done by Mergify.