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

[21136] Add XML configuration for FlowControllerDescriptor to 2.x (backport #4893) #4907

Merged
merged 3 commits into from
Jun 27, 2024

Commits on Jun 6, 2024

  1. Add XML configuration for FlowControllerDescriptor to 2.x (#4893)

    * Refs #21136: Replace const char* with string
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21136: Update fastRTPS_profiles.xsd
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21136: Implement flow controller descriptor list in XML related source files
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21136: Update tests
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21136: versions.md
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21136: Linter
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21136: Apply rev
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    ---------
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    (cherry picked from commit e6044e0)
    
    # Conflicts:
    #	include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp
    #	resources/xsd/fastRTPS_profiles.xsd
    #	test/unittest/dds/profiles/test_xml_profiles.xml
    #	test/unittest/dds/profiles/test_xml_profiles_for_string.xml
    #	test/unittest/xmlparser/XMLParserTests.cpp
    #	test/unittest/xmlparser/XMLProfileParserTests.cpp
    #	test/unittest/xmlparser/test_xml_profile.xml
    #	test/unittest/xmlparser/test_xml_profile_env_var.xml
    #	versions.md
    Mario-DL authored and mergify[bot] committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    f99a999 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Bugfix: Revert XML Flow controller names to const char* (#4911)

    * Refs #21054: Revert to const char* for flow controller names
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21054: Handle flow controller names in a XMLParser collection
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21054: Apply Miguel suggestion
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    * Refs #21054: Apply second suggestion
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    
    ---------
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    Mario-DL committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    a1b78b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Refs #21244: Solve conflicts and remove threadsettings from flow_cont…

    …roller_descriptor
    
    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    Mario-DL committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    268fa5e View commit details
    Browse the repository at this point in the history