diff options
3 files changed, 0 insertions, 35 deletions
diff --git a/configdefinitions/src/vespa/imported-fields.def b/configdefinitions/src/vespa/imported-fields.def index 051226f1615..0947ff63e2a 100644 --- a/configdefinitions/src/vespa/imported-fields.def +++ b/configdefinitions/src/vespa/imported-fields.def @@ -9,12 +9,3 @@ attribute[].referencefield string # The name of the target attribute field in the parent document type that is imported into this document type. attribute[].targetfield string - -# Deprecated. TODO: Remove when going to Vespa 7. -# The data type of the target attribute field. This enum should match the one in attributes.def. -attribute[].datatype enum { STRING, UINT1, UINT2, UINT4, INT8, INT16, INT32, INT64, FLOAT, DOUBLE, PREDICATE, TENSOR, REFERENCE, NONE } default=NONE - -# Deprecated. TODO: Remove when going to Vespa 7. -# The collection type of the target attribute field. This enum should match the one in attributes.def. -attribute[].collectiontype enum { SINGLE, ARRAY, WEIGHTEDSET } default=SINGLE - diff --git a/container-accesslogging/src/main/resources/configdefinitions/access-log.def b/container-accesslogging/src/main/resources/configdefinitions/access-log.def index 9df9299ae19..755f7968e2e 100644 --- a/container-accesslogging/src/main/resources/configdefinitions/access-log.def +++ b/container-accesslogging/src/main/resources/configdefinitions/access-log.def @@ -9,24 +9,6 @@ fileHandler.pattern string # Could just configure "every N minutes" instead fileHandler.rotation string default="0 60 ..." -# TODO remove in Vespa 7, always use DATE -# -# Defines how file rotation is done. There are two options: -# -# DATE: -# The active log file is given the name resulting from pattern (but in this case "pattern" must yield a -# time-dependent name. In addition, a symlink is created pointing to the newest file. -# The symlink is given the name of the symlink parameter (or the name of this service -# if no parameter is given. -# -# SEQUENCE: -# The active log file is given the name -# defined by "pattern" (which in this case will likely just be a constant string). -# At rotation, this file is given the name pattern.N where N is 1 + the largest integer found by -# extracting the integers from all files ending by .Integer in the same directory -# -fileHandler.rotateScheme enum {DATE, SEQUENCE} default=DATE - # Use this as the name of the symlink created pointing to the newest file in the "date" naming scheme. # This is ignored if the sequence naming scheme is used. fileHandler.symlink string default="" diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index 2a673c2379e..8740a91bab7 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -343,14 +343,6 @@ pruneremoveddocumentsinterval double default=0.0 ## Default value is 2 weeks (1209600 seconds). pruneremoveddocumentsage double default=1209600.0 -## NOT USED. TODO: Remove when going to Vespa 7. -## Interval between wiping of old removed document fields (in seconds). -wipeoldremovedfieldsinterval double default=21600.0 - -## NOT USED. TODO: Remove when going to Vespa 7. -## Age of removed document fields before they can be wiped (in seconds). -wipeoldremovedfieldsage double default=1209600.0 - ## Timeout of recovery rpc calls in rowcolumn mode ## ## Default value is 60 seconds |