diff options
Diffstat (limited to 'configdefinitions/src')
65 files changed, 83 insertions, 69 deletions
diff --git a/configdefinitions/src/main/java/com/yahoo/cloud/config/package-info.java b/configdefinitions/src/main/java/com/yahoo/cloud/config/package-info.java index f143339d4dd..77ee4c97102 100644 --- a/configdefinitions/src/main/java/com/yahoo/cloud/config/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/cloud/config/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.cloud.config; diff --git a/configdefinitions/src/main/java/com/yahoo/embedding/huggingface/package-info.java b/configdefinitions/src/main/java/com/yahoo/embedding/huggingface/package-info.java index 7bcc994e616..66302ead9bd 100644 --- a/configdefinitions/src/main/java/com/yahoo/embedding/huggingface/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/embedding/huggingface/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @author bjorncs @@ -6,4 +6,4 @@ @ExportPackage package com.yahoo.embedding.huggingface; -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/configdefinitions/src/main/java/com/yahoo/embedding/package-info.java b/configdefinitions/src/main/java/com/yahoo/embedding/package-info.java index 1842b80aba9..5dad94de6a2 100644 --- a/configdefinitions/src/main/java/com/yahoo/embedding/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/embedding/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.embedding; diff --git a/configdefinitions/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/config/package-info.java b/configdefinitions/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/config/package-info.java index 2a21b128bb5..acb57b89377 100644 --- a/configdefinitions/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/config/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/config/package-info.java @@ -1,6 +1,6 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.jdisc.http.filter.security.cloud.config; -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/configdefinitions/src/main/java/com/yahoo/language/huggingface/config/package-info.java b/configdefinitions/src/main/java/com/yahoo/language/huggingface/config/package-info.java index fb9048b5fb4..97602776531 100644 --- a/configdefinitions/src/main/java/com/yahoo/language/huggingface/config/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/language/huggingface/config/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @author bjorncs @@ -6,4 +6,4 @@ @ExportPackage package com.yahoo.language.huggingface.config; -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/content/core/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/content/core/package-info.java index 22c3371c1d7..160a860e87d 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/config/content/core/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/content/core/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.config.content.core; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/content/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/content/package-info.java index bde038a64f0..66fc7ee5800 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/config/content/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/content/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.config.content; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/content/reindexing/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/content/reindexing/package-info.java index 1eca5562e87..683dde942d1 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/config/content/reindexing/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/content/reindexing/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.config.content.reindexing; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/core/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/core/package-info.java index 11ddbd3613b..f236ed9974e 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/config/core/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/core/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.config.core; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/jdisc/http/filter/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/jdisc/http/filter/package-info.java index 9dcdc2504d1..b2ab7516f76 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/config/jdisc/http/filter/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/jdisc/http/filter/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.config.jdisc.http.filter; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/search/core/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/search/core/package-info.java index 5b0f18203ec..0df1baac3f2 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/config/search/core/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/search/core/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.config.search.core; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/search/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/search/package-info.java index 20ef3d9808a..316e1c468f0 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/config/search/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/search/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.config.search; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/storage/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/storage/package-info.java index 851a8b8c7b6..1d2de617a37 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/config/storage/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/storage/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.config.storage; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/configdefinition/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/configdefinition/package-info.java index f00b5bdf122..42964ddba63 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/configdefinition/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/configdefinition/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.configdefinition; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/config/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/config/package-info.java index 2ccb4c4e31c..02dbd35542e 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/config/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/config/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.hosted.athenz.instanceproviderservice.config; diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java index 3d2f69bb036..4211b3847a9 100644 --- a/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java +++ b/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.vespa.orchestrator.config; diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index bb29db2e3e3..5adfb31ac25 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(configdefinitions SOURCES INSTALL lib64 diff --git a/configdefinitions/src/vespa/all-clusters-bucket-spaces.def b/configdefinitions/src/vespa/all-clusters-bucket-spaces.def index cdd61ec0547..27b935130ed 100644 --- a/configdefinitions/src/vespa/all-clusters-bucket-spaces.def +++ b/configdefinitions/src/vespa/all-clusters-bucket-spaces.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content ## This config contains the document types handled by all content clusters diff --git a/configdefinitions/src/vespa/application-id.def b/configdefinitions/src/vespa/application-id.def index 2407909026f..a7b73cf43a0 100644 --- a/configdefinitions/src/vespa/application-id.def +++ b/configdefinitions/src/vespa/application-id.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Application Id config (tenant, application, instance) namespace=cloud.config diff --git a/configdefinitions/src/vespa/athenz-provider-service.def b/configdefinitions/src/vespa/athenz-provider-service.def index 4c9c74f9b8f..5ee9be323e8 100644 --- a/configdefinitions/src/vespa/athenz-provider-service.def +++ b/configdefinitions/src/vespa/athenz-provider-service.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.hosted.athenz.instanceproviderservice.config # Athenz domain @@ -34,4 +34,4 @@ athenzCaTrustStore string default="" updatePeriodDays int default=1 # Tenant Service id -tenantService string default=vespa.vespa.tenant
\ No newline at end of file +tenantService string default=vespa.vespa.tenant diff --git a/configdefinitions/src/vespa/attributes.def b/configdefinitions/src/vespa/attributes.def index 00787b928a6..db5e185099e 100644 --- a/configdefinitions/src/vespa/attributes.def +++ b/configdefinitions/src/vespa/attributes.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search attribute[].name string diff --git a/configdefinitions/src/vespa/bert-base-embedder.def b/configdefinitions/src/vespa/bert-base-embedder.def index 2d8e840377b..530e8d5aaa6 100644 --- a/configdefinitions/src/vespa/bert-base-embedder.def +++ b/configdefinitions/src/vespa/bert-base-embedder.def @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=embedding diff --git a/configdefinitions/src/vespa/bucketspaces.def b/configdefinitions/src/vespa/bucketspaces.def index bbfdfa1f9d3..3b79b3bae44 100644 --- a/configdefinitions/src/vespa/bucketspaces.def +++ b/configdefinitions/src/vespa/bucketspaces.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content.core ## This config contains the document types handled by a given content cluster diff --git a/configdefinitions/src/vespa/cloud-data-plane-filter.def b/configdefinitions/src/vespa/cloud-data-plane-filter.def index 47478a28039..417e5ebdaa6 100644 --- a/configdefinitions/src/vespa/cloud-data-plane-filter.def +++ b/configdefinitions/src/vespa/cloud-data-plane-filter.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=jdisc.http.filter.security.cloud.config legacyMode bool default=false diff --git a/configdefinitions/src/vespa/cloud-token-data-plane-filter.def b/configdefinitions/src/vespa/cloud-token-data-plane-filter.def index 3219ae4fa48..7f84d2ac76a 100644 --- a/configdefinitions/src/vespa/cloud-token-data-plane-filter.def +++ b/configdefinitions/src/vespa/cloud-token-data-plane-filter.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=jdisc.http.filter.security.cloud.config tokenContext string default="" diff --git a/configdefinitions/src/vespa/cluster-info.def b/configdefinitions/src/vespa/cluster-info.def index fe5d922e6ae..53bced90b38 100644 --- a/configdefinitions/src/vespa/cluster-info.def +++ b/configdefinitions/src/vespa/cluster-info.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Information about the cluster the subscriber is a part of namespace=cloud.config diff --git a/configdefinitions/src/vespa/cluster-list.def b/configdefinitions/src/vespa/cluster-list.def index d3ffa47351e..239437881b7 100644 --- a/configdefinitions/src/vespa/cluster-list.def +++ b/configdefinitions/src/vespa/cluster-list.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config storage[].name string diff --git a/configdefinitions/src/vespa/col-bert-embedder.def b/configdefinitions/src/vespa/col-bert-embedder.def index c7944847d8b..d525affa7f2 100644 --- a/configdefinitions/src/vespa/col-bert-embedder.def +++ b/configdefinitions/src/vespa/col-bert-embedder.def @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=embedding diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index 0f18298b434..de7d0ec561f 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config # Ports diff --git a/configdefinitions/src/vespa/curator.def b/configdefinitions/src/vespa/curator.def index db7cea00882..7b19a2c9543 100644 --- a/configdefinitions/src/vespa/curator.def +++ b/configdefinitions/src/vespa/curator.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config # hostname and port of servers that curator will connect to @@ -9,4 +9,4 @@ server[].port int default=2181 zookeeperLocalhostAffinity bool default=false # session timeout, the high default is used by config servers -zookeeperSessionTimeoutSeconds int default=120
\ No newline at end of file +zookeeperSessionTimeoutSeconds int default=120 diff --git a/configdefinitions/src/vespa/dataplane-proxy.def b/configdefinitions/src/vespa/dataplane-proxy.def index eff5ae8c3a9..5127d21d914 100644 --- a/configdefinitions/src/vespa/dataplane-proxy.def +++ b/configdefinitions/src/vespa/dataplane-proxy.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config # The port Jdisc will be listening on diff --git a/configdefinitions/src/vespa/dispatch-nodes.def b/configdefinitions/src/vespa/dispatch-nodes.def index e751ad4ac5d..6f41f581453 100644 --- a/configdefinitions/src/vespa/dispatch-nodes.def +++ b/configdefinitions/src/vespa/dispatch-nodes.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # List of nodes in a search cluster to dispatch to. namespace=vespa.config.search diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/dispatch.def index 01fc5d48dfa..0f11f94d51d 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/dispatch.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Configuration of dispatch from container nodes to search clusters namespace=vespa.config.search diff --git a/configdefinitions/src/vespa/distribution.def b/configdefinitions/src/vespa/distribution.def index 9c5c9f71fd0..5a46163ee79 100644 --- a/configdefinitions/src/vespa/distribution.def +++ b/configdefinitions/src/vespa/distribution.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content ## @@ -43,4 +43,4 @@ cluster{}.group[].partitions string default="" cluster{}.group[].nodes[].index int # Whether this node is retired, and data should migrate out of it. -cluster{}.group[].nodes[].retired bool default=false
\ No newline at end of file +cluster{}.group[].nodes[].retired bool default=false diff --git a/configdefinitions/src/vespa/fleetcontroller.def b/configdefinitions/src/vespa/fleetcontroller.def index c3e161eb038..39dbd9f9e12 100644 --- a/configdefinitions/src/vespa/fleetcontroller.def +++ b/configdefinitions/src/vespa/fleetcontroller.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content ## Name of VDS cluster diff --git a/configdefinitions/src/vespa/hugging-face-embedder.def b/configdefinitions/src/vespa/hugging-face-embedder.def index 7ea4227b3cd..a26f6917443 100644 --- a/configdefinitions/src/vespa/hugging-face-embedder.def +++ b/configdefinitions/src/vespa/hugging-face-embedder.def @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=embedding.huggingface # Path to tokenizer.json diff --git a/configdefinitions/src/vespa/hugging-face-tokenizer.def b/configdefinitions/src/vespa/hugging-face-tokenizer.def index 896a7b03234..a82e4b4a1f4 100644 --- a/configdefinitions/src/vespa/hugging-face-tokenizer.def +++ b/configdefinitions/src/vespa/hugging-face-tokenizer.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=language.huggingface.config diff --git a/configdefinitions/src/vespa/hwinfo.def b/configdefinitions/src/vespa/hwinfo.def index 60dff099fa2..3d803e4e195 100644 --- a/configdefinitions/src/vespa/hwinfo.def +++ b/configdefinitions/src/vespa/hwinfo.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search.core ## Write speed, MiB/s, typically measured by writing 1 GiB data to disk. diff --git a/configdefinitions/src/vespa/ilscripts.def b/configdefinitions/src/vespa/ilscripts.def index 503cccb0892..16671806603 100644 --- a/configdefinitions/src/vespa/ilscripts.def +++ b/configdefinitions/src/vespa/ilscripts.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.configdefinition ## The maximum number of occurrences of a given term to index per field diff --git a/configdefinitions/src/vespa/imported-fields.def b/configdefinitions/src/vespa/imported-fields.def index 105725976e5..ce309528a3a 100644 --- a/configdefinitions/src/vespa/imported-fields.def +++ b/configdefinitions/src/vespa/imported-fields.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search # The name of an imported attribute field in context of this document type. diff --git a/configdefinitions/src/vespa/indexschema.def b/configdefinitions/src/vespa/indexschema.def index d8e33533499..12f2928a8c7 100644 --- a/configdefinitions/src/vespa/indexschema.def +++ b/configdefinitions/src/vespa/indexschema.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ## Config specifying the index fields and field collections that are part of an index schema. namespace=vespa.config.search diff --git a/configdefinitions/src/vespa/jdisc.http.filter.security.rule.config.rule-based-filter.def b/configdefinitions/src/vespa/jdisc.http.filter.security.rule.config.rule-based-filter.def index 3fe850908dc..b17f7cd29eb 100644 --- a/configdefinitions/src/vespa/jdisc.http.filter.security.rule.config.rule-based-filter.def +++ b/configdefinitions/src/vespa/jdisc.http.filter.security.rule.config.rule-based-filter.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package=com.yahoo.vespa.config.jdisc.http.filter dryrun bool default=false diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/lb-services.def index 5e9460ddfc4..42f1bd639f1 100644 --- a/configdefinitions/src/vespa/lb-services.def +++ b/configdefinitions/src/vespa/lb-services.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Config for load balancer that needs to know about all services for # all tenants and applications in a config server cluster diff --git a/configdefinitions/src/vespa/load-type.def b/configdefinitions/src/vespa/load-type.def index 0a44975e252..56a7d503c5a 100644 --- a/configdefinitions/src/vespa/load-type.def +++ b/configdefinitions/src/vespa/load-type.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ## This config is used to define load types in VESPA. Load types are merely ## a way to distinguish types of load, as to present such types differently. ## For instance, some metrics will be presented per load type, such that you diff --git a/configdefinitions/src/vespa/logforwarder.def b/configdefinitions/src/vespa/logforwarder.def index 4f6b3fc61a7..808aefc0581 100644 --- a/configdefinitions/src/vespa/logforwarder.def +++ b/configdefinitions/src/vespa/logforwarder.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config # only splunk type config for now diff --git a/configdefinitions/src/vespa/messagetyperouteselectorpolicy.def b/configdefinitions/src/vespa/messagetyperouteselectorpolicy.def index 4555ed3d83a..c06f3de7641 100644 --- a/configdefinitions/src/vespa/messagetyperouteselectorpolicy.def +++ b/configdefinitions/src/vespa/messagetyperouteselectorpolicy.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content # Default route if no override is set for a type. diff --git a/configdefinitions/src/vespa/model.def b/configdefinitions/src/vespa/model.def index e08d23d45b6..950d80f65bc 100644 --- a/configdefinitions/src/vespa/model.def +++ b/configdefinitions/src/vespa/model.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config vespaVersion string default="unknown" diff --git a/configdefinitions/src/vespa/onnx-models.def b/configdefinitions/src/vespa/onnx-models.def index 67a83e2afb7..d290aa9a232 100644 --- a/configdefinitions/src/vespa/onnx-models.def +++ b/configdefinitions/src/vespa/onnx-models.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search.core # Number of GPUs available for ONNX evaluation, or -1 if unknown. diff --git a/configdefinitions/src/vespa/orchestrator.def b/configdefinitions/src/vespa/orchestrator.def index 459e8502236..a87a37e568a 100644 --- a/configdefinitions/src/vespa/orchestrator.def +++ b/configdefinitions/src/vespa/orchestrator.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.orchestrator.config # TODO: Change the default to actual latency in real setup. diff --git a/configdefinitions/src/vespa/persistence.def b/configdefinitions/src/vespa/persistence.def index 137514f1715..961f99d8e4b 100644 --- a/configdefinitions/src/vespa/persistence.def +++ b/configdefinitions/src/vespa/persistence.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content ## If set, causes the service layer to trigger an abort of any queued diff --git a/configdefinitions/src/vespa/proton.def b/configdefinitions/src/vespa/proton.def index e85e6c58e11..a1a13d90d3c 100644 --- a/configdefinitions/src/vespa/proton.def +++ b/configdefinitions/src/vespa/proton.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search.core ## Base directory. The default is ignored as it is assigned by the model @@ -238,7 +238,7 @@ summary.log.maxfilesize long default=1000000000 ## Max number of lid entries per file ## TODO Decide based on memory on node. -summary.log.maxnumlids int default=40000000 +summary.log.maxnumlids int default=8388608 ## Max disk bloat factor. This will trigger compacting. summary.log.maxdiskbloatfactor double default=0.1 diff --git a/configdefinitions/src/vespa/rank-profiles.def b/configdefinitions/src/vespa/rank-profiles.def index b0f7a2f5ded..f8a6691bf30 100644 --- a/configdefinitions/src/vespa/rank-profiles.def +++ b/configdefinitions/src/vespa/rank-profiles.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search ## name of this rank profile. maps to table index for internal use. @@ -10,3 +10,14 @@ rankprofile[].fef.property[].name string ## the value of a generic property available to feature plugins rankprofile[].fef.property[].value string +## output from cross-hits normalizing function +rankprofile[].normalizer[].name string + +## input to cross-hits normalizing function +rankprofile[].normalizer[].input string + +## type of cross-hits normalizing function +rankprofile[].normalizer[].algo enum { LINEAR, RRANK } default=LINEAR + +## extra "k" param (if applicable) +rankprofile[].normalizer[].kparam double default=60.0 diff --git a/configdefinitions/src/vespa/ranking-constants.def b/configdefinitions/src/vespa/ranking-constants.def index 26dfa564a85..3832dadaaf8 100644 --- a/configdefinitions/src/vespa/ranking-constants.def +++ b/configdefinitions/src/vespa/ranking-constants.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search.core constant[].name string diff --git a/configdefinitions/src/vespa/ranking-expressions.def b/configdefinitions/src/vespa/ranking-expressions.def index a9401a4bccb..8d6bca32644 100644 --- a/configdefinitions/src/vespa/ranking-expressions.def +++ b/configdefinitions/src/vespa/ranking-expressions.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search.core expression[].name string diff --git a/configdefinitions/src/vespa/reindexing.def b/configdefinitions/src/vespa/reindexing.def index 0195c737809..cb05c1c79ea 100644 --- a/configdefinitions/src/vespa/reindexing.def +++ b/configdefinitions/src/vespa/reindexing.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Reindexing status per document type, for a Vespa application namespace=vespa.config.content.reindexing diff --git a/configdefinitions/src/vespa/sentinel.def b/configdefinitions/src/vespa/sentinel.def index 62080705067..07becf6cccf 100644 --- a/configdefinitions/src/vespa/sentinel.def +++ b/configdefinitions/src/vespa/sentinel.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config ## The port where sentinel should run its telnet interface diff --git a/configdefinitions/src/vespa/slobroks.def b/configdefinitions/src/vespa/slobroks.def index 9a98af272dd..5aef3790831 100644 --- a/configdefinitions/src/vespa/slobroks.def +++ b/configdefinitions/src/vespa/slobroks.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config ### Changes to this config requires restart diff --git a/configdefinitions/src/vespa/specialtokens.def b/configdefinitions/src/vespa/specialtokens.def index 5e9ac4064dc..d6631b98125 100644 --- a/configdefinitions/src/vespa/specialtokens.def +++ b/configdefinitions/src/vespa/specialtokens.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ## Named lists of special tokens - string which should be ## treated as words no matter what characters they consist of. ## A special token can also optionally be replaced by another diff --git a/configdefinitions/src/vespa/stateserver.def b/configdefinitions/src/vespa/stateserver.def index 36778aa73de..615ffcef368 100644 --- a/configdefinitions/src/vespa/stateserver.def +++ b/configdefinitions/src/vespa/stateserver.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.core # Port used for serving the state/vN api diff --git a/configdefinitions/src/vespa/stor-distribution.def b/configdefinitions/src/vespa/stor-distribution.def index c5599a8589b..fc73983b0b8 100644 --- a/configdefinitions/src/vespa/stor-distribution.def +++ b/configdefinitions/src/vespa/stor-distribution.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content ## Redundancy decides how many copies of documents will be stored. Documents diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/stor-filestor.def index cd89530c89c..c7ac1472d30 100644 --- a/configdefinitions/src/vespa/stor-filestor.def +++ b/configdefinitions/src/vespa/stor-filestor.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content ## DETECT FAILURE PARAMETERS diff --git a/configdefinitions/src/vespa/summary.def b/configdefinitions/src/vespa/summary.def index 0f6232153c7..616456d98eb 100644 --- a/configdefinitions/src/vespa/summary.def +++ b/configdefinitions/src/vespa/summary.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search defaultsummaryid int default=-1 diff --git a/configdefinitions/src/vespa/upgrading.def b/configdefinitions/src/vespa/upgrading.def index 3d9b7fa563b..86f7391835d 100644 --- a/configdefinitions/src/vespa/upgrading.def +++ b/configdefinitions/src/vespa/upgrading.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.content ## Config specifying cluster global parameters for a storage cluster. diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/zookeeper-server.def index f58fdbeec14..d1cea49ee6f 100644 --- a/configdefinitions/src/vespa/zookeeper-server.def +++ b/configdefinitions/src/vespa/zookeeper-server.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config # Vespa home is prepended if the file is relative diff --git a/configdefinitions/src/vespa/zookeepers.def b/configdefinitions/src/vespa/zookeepers.def index be4b1b1ace5..59accf892a3 100644 --- a/configdefinitions/src/vespa/zookeepers.def +++ b/configdefinitions/src/vespa/zookeepers.def @@ -1,3 +1,3 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config zookeeperserverlist string |