diff options
author | gjoranv <gjoranv@gmail.com> | 2017-08-30 16:05:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-30 16:05:44 +0200 |
commit | 3c511d8697c0dff3f54f660d063b17a2c3b28da4 (patch) | |
tree | cab573adac5d32015404116e9eef7737f169b1ce /docproc | |
parent | 3cb0be608c2d3b3253c24b56ba219baebef51946 (diff) | |
parent | 36f7e720738de89e13231ebaa803a95e98a2758d (diff) |
Merge pull request #3275 from vespa-engine/revert-3260-hmusum/remove-version-from-def-files
Revert "version in def files are deprecated"
Diffstat (limited to 'docproc')
4 files changed, 4 insertions, 0 deletions
diff --git a/docproc/src/main/resources/configdefinitions/docproc.def b/docproc/src/main/resources/configdefinitions/docproc.def index 3b4c4fc5b16..76acfdfca8a 100644 --- a/docproc/src/main/resources/configdefinitions/docproc.def +++ b/docproc/src/main/resources/configdefinitions/docproc.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=12 namespace=config.docproc # Queue size (in milliseconds) for this node diff --git a/docproc/src/main/resources/configdefinitions/schemamapping.def b/docproc/src/main/resources/configdefinitions/schemamapping.def index d70235fbfc0..87afe204770 100644 --- a/docproc/src/main/resources/configdefinitions/schemamapping.def +++ b/docproc/src/main/resources/configdefinitions/schemamapping.def @@ -1,6 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Use when a docproc works on a generic set of field names and the actual names # in input doc may be different +version=1 namespace=config.docproc # The chain this mapping applies to diff --git a/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def b/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def index dea6141e6cc..c96a6c63d3c 100644 --- a/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def +++ b/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=2 namespace=config.docproc # The name of the enclosing (outer) document type diff --git a/docproc/src/test/vespa-configdef/string.def b/docproc/src/test/vespa-configdef/string.def index 3e76855f1e8..9e59f7caec4 100644 --- a/docproc/src/test/vespa-configdef/string.def +++ b/docproc/src/test/vespa-configdef/string.def @@ -1,4 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +version=1 namespace=config.docproc stringVal string default="_default_" |