diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-25 13:40:18 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-25 13:40:18 +0200 |
| commit | bccd559bd26899198232b67fb470391cd1ba855d (patch) | |
| tree | 450020f97b4c6d3ee0d1f9070d11c07ac4b7aa2f /container-search | |
| parent | cc7153b5c502bfdfa9603182cfe6848f955075de (diff) | |
| parent | 59873ed9fec892a712a8c71b95a45efcfb39d25d (diff) | |
Merge with master
Diffstat (limited to 'container-search')
| -rw-r--r-- | container-search/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search-nodes.def | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/container-search/CMakeLists.txt b/container-search/CMakeLists.txt index a6099fea63b..87d192a50f4 100644 --- a/container-search/CMakeLists.txt +++ b/container-search/CMakeLists.txt @@ -17,7 +17,6 @@ install_config_definition(src/main/resources/configdefinitions/query-profiles.de install_config_definition(src/main/resources/configdefinitions/rate-limiting.def search.config.rate-limiting.def) install_config_definition(src/main/resources/configdefinitions/resolvers.def search.pagetemplates.resolvers.def) install_config_definition(src/main/resources/configdefinitions/rewrites.def search.query.rewrite.rewrites.def) -install_config_definition(src/main/resources/configdefinitions/search-nodes.def search.config.dispatchprototype.search-nodes.def) install_config_definition(src/main/resources/configdefinitions/search-with-renderer-handler.def search.handler.search-with-renderer-handler.def) install_config_definition(src/main/resources/configdefinitions/searchchain-forward.def search.federation.searchchain-forward.def) install_config_definition(src/main/resources/configdefinitions/semantic-rules.def prelude.semantics.semantic-rules.def) diff --git a/container-search/src/main/resources/configdefinitions/search-nodes.def b/container-search/src/main/resources/configdefinitions/search-nodes.def deleted file mode 100644 index 84e0aa719d8..00000000000 --- a/container-search/src/main/resources/configdefinitions/search-nodes.def +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.config.dispatchprototype - -search_node[].host string -search_node[].port int |