summaryrefslogtreecommitdiffstats
path: root/container-search-and-docproc
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-09-11 18:41:54 +0200
committerGitHub <noreply@github.com>2020-09-11 18:41:54 +0200
commit807761ce70f955f20fcc26dbd4d857e4f0c5fdb2 (patch)
treef7545a1913f5a502779bc80f7cc50c131442cf7c /container-search-and-docproc
parentb9d08a9fe934e1d94a7402ad5e9f9b7cfd990633 (diff)
parent64ebd3904a7e76072e3841bed45cf7e408542f4f (diff)
Merge pull request #14370 from vespa-engine/hmusum/move-config-definitions-to-use-full-name-in-filename
Use full name in config definition file names
Diffstat (limited to 'container-search-and-docproc')
-rw-r--r--container-search-and-docproc/CMakeLists.txt2
-rw-r--r--container-search-and-docproc/src/main/resources/configdefinitions/container.handler.observability.application-userdata.def (renamed from container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def)0
2 files changed, 1 insertions, 1 deletions
diff --git a/container-search-and-docproc/CMakeLists.txt b/container-search-and-docproc/CMakeLists.txt
index 29bbe5bdb0f..aef014583f5 100644
--- a/container-search-and-docproc/CMakeLists.txt
+++ b/container-search-and-docproc/CMakeLists.txt
@@ -1,4 +1,4 @@
# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
install_fat_java_artifact(container-search-and-docproc)
-install_config_definition(src/main/resources/configdefinitions/application-userdata.def container.handler.observability.application-userdata.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def b/container-search-and-docproc/src/main/resources/configdefinitions/container.handler.observability.application-userdata.def
index 0285d3d2103..0285d3d2103 100644
--- a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def
+++ b/container-search-and-docproc/src/main/resources/configdefinitions/container.handler.observability.application-userdata.def