diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-08-30 16:10:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-30 16:10:45 +0200 |
commit | 9f55f0516de6d61509c9b99771625e8322e73e12 (patch) | |
tree | f8b6d2b1a9eb3a31cc4382eae98281934eb95116 /container-core | |
parent | 3c511d8697c0dff3f54f660d063b17a2c3b28da4 (diff) |
Revert "Revert "version in def files are deprecated""
Diffstat (limited to 'container-core')
13 files changed, 0 insertions, 13 deletions
diff --git a/container-core/src/main/resources/configdefinitions/application-metadata.def b/container-core/src/main/resources/configdefinitions/application-metadata.def index 802db6c36da..a3ccf1b55cf 100644 --- a/container-core/src/main/resources/configdefinitions/application-metadata.def +++ b/container-core/src/main/resources/configdefinitions/application-metadata.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Contains meta info about one deployed application -version=4 namespace=container.core # The name of the directory that contained the application package diff --git a/container-core/src/main/resources/configdefinitions/container-document.def b/container-core/src/main/resources/configdefinitions/container-document.def index 9d1d41d2b48..e8db64b011a 100644 --- a/container-core/src/main/resources/configdefinitions/container-document.def +++ b/container-core/src/main/resources/configdefinitions/container-document.def @@ -2,7 +2,6 @@ # # Container settings for document type management # -version=1 namespace=container.core.document # A document type name to use a concrete document type for diff --git a/container-core/src/main/resources/configdefinitions/diagnostics.def b/container-core/src/main/resources/configdefinitions/diagnostics.def index cab58b0df97..33f733d4386 100644 --- a/container-core/src/main/resources/configdefinitions/diagnostics.def +++ b/container-core/src/main/resources/configdefinitions/diagnostics.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=container.core ## The fraction of queries to time out over a period of 10s to consider diff --git a/container-core/src/main/resources/configdefinitions/health-monitor.def b/container-core/src/main/resources/configdefinitions/health-monitor.def index adc8c9f9487..dc5cdbc6ca4 100644 --- a/container-core/src/main/resources/configdefinitions/health-monitor.def +++ b/container-core/src/main/resources/configdefinitions/health-monitor.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=container.jdisc.config diff --git a/container-core/src/main/resources/configdefinitions/metrics-presentation.def b/container-core/src/main/resources/configdefinitions/metrics-presentation.def index f1dbeeb43fd..b6c40993ef5 100644 --- a/container-core/src/main/resources/configdefinitions/metrics-presentation.def +++ b/container-core/src/main/resources/configdefinitions/metrics-presentation.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=metrics diff --git a/container-core/src/main/resources/configdefinitions/qr-logging.def b/container-core/src/main/resources/configdefinitions/qr-logging.def index 8db776eafbf..f828f321ae7 100644 --- a/container-core/src/main/resources/configdefinitions/qr-logging.def +++ b/container-core/src/main/resources/configdefinitions/qr-logging.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=4 namespace=container.core logger string default="com.yahoo" # Either QueryAccessLog for a regular Vespa access log, or YApacheAccessLog for a log on yApache format diff --git a/container-core/src/main/resources/configdefinitions/qr-searchers.def b/container-core/src/main/resources/configdefinitions/qr-searchers.def index e9c7d0ff06f..a688749da6d 100644 --- a/container-core/src/main/resources/configdefinitions/qr-searchers.def +++ b/container-core/src/main/resources/configdefinitions/qr-searchers.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=49 namespace=container # this file needs more comments diff --git a/container-core/src/main/resources/configdefinitions/qr-templates.def b/container-core/src/main/resources/configdefinitions/qr-templates.def index 4d419e12bc2..46b1a5cbd65 100644 --- a/container-core/src/main/resources/configdefinitions/qr-templates.def +++ b/container-core/src/main/resources/configdefinitions/qr-templates.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Not used # TODO: Remove on Vespa 7 -version=8 namespace=container.core ## Prefix to use in queries to choose a given template diff --git a/container-core/src/main/resources/configdefinitions/qr.def b/container-core/src/main/resources/configdefinitions/qr.def index 6efd2d5646c..f06cd2061c1 100644 --- a/container-core/src/main/resources/configdefinitions/qr.def +++ b/container-core/src/main/resources/configdefinitions/qr.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=37 namespace=container ### All params must be flagged as 'restart' because this config is manually diff --git a/container-core/src/main/resources/configdefinitions/threadpool.def b/container-core/src/main/resources/configdefinitions/threadpool.def index 36d15ca9bca..5b5e7e2f4a2 100644 --- a/container-core/src/main/resources/configdefinitions/threadpool.def +++ b/container-core/src/main/resources/configdefinitions/threadpool.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=container.handler diff --git a/container-core/src/main/resources/configdefinitions/vip-status.def b/container-core/src/main/resources/configdefinitions/vip-status.def index abed5194b10..44da7292f05 100644 --- a/container-core/src/main/resources/configdefinitions/vip-status.def +++ b/container-core/src/main/resources/configdefinitions/vip-status.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=container.core ## If there is a Vespa search backend connected to this container, and that diff --git a/container-core/src/test/vespa-configdef/int.def b/container-core/src/test/vespa-configdef/int.def index 45431fb5571..48a94e6bfcd 100644 --- a/container-core/src/test/vespa-configdef/int.def +++ b/container-core/src/test/vespa-configdef/int.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=config.core diff --git a/container-core/src/test/vespa-configdef/string.def b/container-core/src/test/vespa-configdef/string.def index f08dad5baee..250dec3955e 100644 --- a/container-core/src/test/vespa-configdef/string.def +++ b/container-core/src/test/vespa-configdef/string.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=config.core |