-
Notifications
You must be signed in to change notification settings - Fork 738
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
[21136] Add XML configuration for FlowControllerDescriptor to 2.x (backport #4893) #4906
Open
mergify
wants to merge
2
commits into
2.10.x
Choose a base branch
from
mergify/bp/2.10.x/pr-4893
base: 2.10.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains 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
* Refs #21136: Replace const char* with string Signed-off-by: Mario Dominguez <[email protected]> * Refs #21136: Update fastRTPS_profiles.xsd Signed-off-by: Mario Dominguez <[email protected]> * Refs #21136: Implement flow controller descriptor list in XML related source files Signed-off-by: Mario Dominguez <[email protected]> * Refs #21136: Update tests Signed-off-by: Mario Dominguez <[email protected]> * Refs #21136: versions.md Signed-off-by: Mario Dominguez <[email protected]> * Refs #21136: Linter Signed-off-by: Mario Dominguez <[email protected]> * Refs #21136: Apply rev Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit e6044e0) # Conflicts: # include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp # resources/xsd/fastRTPS_profiles.xsd # test/unittest/dds/profiles/test_xml_for_string_profile.xml # test/unittest/dds/profiles/test_xml_profile.xml # test/unittest/xmlparser/XMLProfileParserTests.cpp # test/unittest/xmlparser/test_xml_profile.xml # test/unittest/xmlparser/test_xml_profile_env_var.xml # versions.md
Cherry-pick of e6044e0 has failed:
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 |
14 tasks
12 tasks
* Refs #21054: Revert to const char* for flow controller names Signed-off-by: Mario Dominguez <[email protected]> * Refs #21054: Handle flow controller names in a XMLParser collection Signed-off-by: Mario Dominguez <[email protected]> * Refs #21054: Apply Miguel suggestion Signed-off-by: Mario Dominguez <[email protected]> * Refs #21054: Apply second suggestion Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
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](https://mergify.com).