diff options
| -rw-r--r-- | storage/src/tests/common/testhelper.cpp | 1 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/config/stor-messageforwarder.def | 4 | ||||
| -rw-r--r-- | storageserver/src/tests/testhelper.cpp | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp index bbaf131f3ba..0f0a7cd8b55 100644 --- a/storage/src/tests/common/testhelper.cpp +++ b/storage/src/tests/common/testhelper.cpp @@ -81,7 +81,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & ro // Don't want test to call exit() config->set("fail_disk_after_error_count", "0"); config = &dc.addConfig("stor-bouncer"); - config = &dc.addConfig("stor-messageforwarder"); config = &dc.addConfig("stor-server"); config->set("cluster_name", clusterName); config->set("enable_dead_lock_detector", "false"); diff --git a/storage/src/vespa/storage/config/CMakeLists.txt b/storage/src/vespa/storage/config/CMakeLists.txt index 089b86b2a2c..cd3d99d0ccc 100644 --- a/storage/src/vespa/storage/config/CMakeLists.txt +++ b/storage/src/vespa/storage/config/CMakeLists.txt @@ -12,8 +12,6 @@ vespa_generate_config(storage_storageconfig stor-server.def) install_config_definition(stor-server.def vespa.config.content.core.stor-server.def) vespa_generate_config(storage_storageconfig stor-status.def) install_config_definition(stor-status.def vespa.config.content.core.stor-status.def) -vespa_generate_config(storage_storageconfig stor-messageforwarder.def) -install_config_definition(stor-messageforwarder.def vespa.config.content.core.stor-messageforwarder.def) vespa_generate_config(storage_storageconfig stor-opslogger.def) install_config_definition(stor-opslogger.def vespa.config.content.core.stor-opslogger.def) vespa_generate_config(storage_storageconfig stor-visitordispatcher.def) diff --git a/storage/src/vespa/storage/config/stor-messageforwarder.def b/storage/src/vespa/storage/config/stor-messageforwarder.def deleted file mode 100644 index b17e6ddae3b..00000000000 --- a/storage/src/vespa/storage/config/stor-messageforwarder.def +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.config.content.core - -route string default="" restart diff --git a/storageserver/src/tests/testhelper.cpp b/storageserver/src/tests/testhelper.cpp index 4615404bf83..ed9597e3160 100644 --- a/storageserver/src/tests/testhelper.cpp +++ b/storageserver/src/tests/testhelper.cpp @@ -62,7 +62,6 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) { config->set("revert_time_period", "2000000000"); config = &dc.addConfig("stor-bouncer"); config = &dc.addConfig("stor-integritychecker"); - config = &dc.addConfig("stor-messageforwarder"); config = &dc.addConfig("stor-server"); config->set("enable_dead_lock_detector", "false"); config->set("enable_dead_lock_detector_warnings", "false"); |