summaryrefslogtreecommitdiffstats
path: root/configdefinitions
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-09-07 10:06:56 +0200
committerGitHub <noreply@github.com>2017-09-07 10:06:56 +0200
commit99e2fb82a9261c3617ddc26fced06c8505b0688a (patch)
tree38b6561b530aad9ed5a5b1f50d1d61d00b8d9624 /configdefinitions
parent6ccede1c4c0caca9fb55ab7a7b5d87e201f78522 (diff)
Revert "Move orchestrator.def to configdefinititions/"
Diffstat (limited to 'configdefinitions')
-rw-r--r--configdefinitions/src/vespa/CMakeLists.txt2
-rw-r--r--configdefinitions/src/vespa/orchestrator.def5
2 files changed, 0 insertions, 7 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index 1566e97ff3a..96a48acb72b 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -34,8 +34,6 @@ vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def)
install(FILES messagetyperouteselectorpolicy.def DESTINATION var/db/vespa/config_server/serverdb/classes)
vespa_generate_config(configdefinitions model.def)
install(FILES model.def DESTINATION var/db/vespa/config_server/serverdb/classes)
-vespa_generate_config(configdefinitions orchestrator.def)
-install(FILES orchestrator.def DESTINATION var/db/vespa/config_server/serverdb/classes)
vespa_generate_config(configdefinitions persistence.def)
install(FILES persistence.def DESTINATION var/db/vespa/config_server/serverdb/classes)
vespa_generate_config(configdefinitions rank-profiles.def)
diff --git a/configdefinitions/src/vespa/orchestrator.def b/configdefinitions/src/vespa/orchestrator.def
deleted file mode 100644
index a546f8e8a1c..00000000000
--- a/configdefinitions/src/vespa/orchestrator.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=vespa.orchestrator
-
-# TODO: Change the default to actual latency in real setup.
-serviceMonitorConvergenceLatencySeconds int default=0