Merge branch 'main' into add_sanitizers_to_ci

bloomberg · Jul 17, 2024 · 4f87f18 · 4f87f18
2 parents c19622c + 7f817c4
commit 4f87f18
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/src/groups/mqb/mqbnet/mqbnet_tcpsessionfactory.cpp b/src/groups/mqb/mqbnet/mqbnet_tcpsessionfactory.cpp
@@ -958,13 +958,6 @@ int TCPSessionFactory::start(bsl::ostream& errorDescription)
 
     int rc = 0;
 
-    const mqbcfg::AppConfig& appConfig = mqbcfg::BrokerConfig::get();
-
-    if (!appConfig.networkInterfaces().tcpInterface().value().useNtf()) {
-        BALL_LOG_WARN << "Ignoring interface property 'useNtf' (false) "
-                      << "and using ntf, because only ntf supported";
-    }
-
     ntca::InterfaceConfig interfaceConfig = ntcCreateInterfaceConfig(d_config);
 
     bslma::ManagedPtr<mwcio::NtcChannelFactory> channelFactory;

diff --git a/src/python/blazingmq/dev/configurator/__init__.py b/src/python/blazingmq/dev/configurator/__init__.py
@@ -559,7 +559,6 @@ class Proto:
                         node_low_watermark=5242880,
                         node_high_watermark=1073741824,
                         heartbeat_interval_ms=3000,
-                        use_ntf=False,
                     ),
                 ),
                 bmqconf_config=mqbcfg.BmqconfConfig(cache_ttlseconds=30),