On branch mergify/bp/2.6.x/pr-3733
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit c8ab8602a.
  (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/ParameterTypes.hpp
	modified:   include/fastdds/rtps/builtin/BuiltinProtocols.h
	new file:   include/fastdds/rtps/builtin/data/NetworkConfiguration.hpp
	modified:   include/fastdds/rtps/builtin/data/ParticipantProxyData.h
	modified:   include/fastdds/rtps/builtin/data/ReaderProxyData.h
	modified:   include/fastdds/rtps/builtin/data/WriterProxyData.h
	modified:   include/fastdds/rtps/common/Types.h
	modified:   include/fastdds/rtps/network/NetworkFactory.h
	modified:   include/fastdds/rtps/transport/ChainingTransport.h
	modified:   include/fastrtps/qos/ParameterTypes.h
	modified:   src/cpp/fastdds/core/policy/ParameterSerializer.hpp
	modified:   src/cpp/fastdds/domain/DomainParticipantImpl.cpp
	modified:   src/cpp/rtps/builtin/BuiltinProtocols.cpp
	modified:   src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
	modified:   src/cpp/rtps/builtin/data/ReaderProxyData.cpp
	modified:   src/cpp/rtps/builtin/data/WriterProxyData.cpp
	modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   src/cpp/rtps/transport/TCPAcceptor.cpp
	modified:   src/cpp/rtps/transport/TCPAcceptorBasic.cpp
	modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	modified:   src/cpp/rtps/transport/TCPv6Transport.cpp
	modified:   src/cpp/rtps/transport/TCPv6Transport.h
	modified:   src/cpp/rtps/transport/UDPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.h
	modified:   src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp
	modified:   src/cpp/rtps/transport/shared_mem/SharedMemTransport.h
	modified:   test/blackbox/common/BlackboxTestsNetworkConf.cpp
	modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp
	modified:   test/blackbox/common/BlackboxTestsTransportUDP.cpp
	modified:   test/unittest/rtps/network/mock/MockTransport.h
	modified:   test/unittest/transport/SharedMemTests.cpp
	modified:   test/unittest/transport/TCPv6Tests.cpp
	modified:   test/unittest/transport/UDPv6Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
	both modified:   include/fastdds/rtps/transport/TransportInterface.h
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   test/mock/rtps/NetworkFactory/fastdds/rtps/network/NetworkFactory.h