aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/main/resources
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-08-30 08:46:06 +0200
committerJon Bratseth <bratseth@oath.com>2018-08-30 08:46:06 +0200
commit8d32f55ec5fb5066108356bba7d6565cfd9b547c (patch)
tree91135e8d4a49899b5bff8e4127445017f343f134 /container-core/src/main/resources
parent114f42cb0ea790bc758b779f8c747184b68bfe2b (diff)
Revert "Merge pull request #6726 from vespa-engine/revert-6719-bratseth/initially-down"
This reverts commit 05ea4c2b9952bceaf0e009053c2f51a09d15a957, reversing changes made to 03efdabdc9f0e43fc2c362569ae455a7abc9a64b.
Diffstat (limited to 'container-core/src/main/resources')
-rw-r--r--container-core/src/main/resources/configdefinitions/vip-status.def3
1 files changed, 2 insertions, 1 deletions
diff --git a/container-core/src/main/resources/configdefinitions/vip-status.def b/container-core/src/main/resources/configdefinitions/vip-status.def
index 1e364419ab8..6aa10ff1b90 100644
--- a/container-core/src/main/resources/configdefinitions/vip-status.def
+++ b/container-core/src/main/resources/configdefinitions/vip-status.def
@@ -4,6 +4,7 @@ namespace=container.core
## If there is a Vespa search backend connected to this container, and that
## backend is out of service, automatically remove this container from VIP
## rotation, ignoring any status file.
+## TODO VESPA 7: This is always true and can be removed
noSearchBackendsImpliesOutOfService bool default=true
## Whether to return hard-coded reply or serve "status.html" from disk
@@ -13,5 +14,5 @@ accessdisk bool default=false
## If the path is relative vespa home is prepended
statusfile string default="share/qrsdocs/status.html"
-## The initial rotation state when no information is known about backend clusters
+## The default rotation state when there are no configured clusters to decide rotation state
initiallyInRotation bool default=true