diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-06-07 15:15:59 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:31 +0200 |
| commit | f894674142a0b6ca3accb281a16b4dd7700043e2 (patch) | |
| tree | 304d28204547b76f4903bfdcd5862e575382834f /config-model | |
| parent | 8a01b3e2106739aaaf4ad918edbed04244360eb2 (diff) | |
Remove TODOs
These are for compatibility with Vespa 7 apps, will be removed when
there are no more Vespa 7 apps in hosted
Diffstat (limited to 'config-model')
4 files changed, 7 insertions, 8 deletions
diff --git a/config-model/src/main/resources/schema/version/7.x/common.rnc b/config-model/src/main/resources/schema/version/7.x/common.rnc index 275c0f7f702..45183b0657c 100644 --- a/config-model/src/main/resources/schema/version/7.x/common.rnc +++ b/config-model/src/main/resources/schema/version/7.x/common.rnc @@ -44,7 +44,7 @@ OptionalDedicatedNodes = element nodes { GenericConfig = element config { attribute name { text }, - attribute namespace { text }?, # TODO: Remove in Vespa 8 + attribute namespace { text }?, attribute version { text }?, anyElement* } diff --git a/config-model/src/main/resources/schema/version/7.x/container.rnc b/config-model/src/main/resources/schema/version/7.x/container.rnc index c16a5c4e3a5..f7f63829281 100644 --- a/config-model/src/main/resources/schema/version/7.x/container.rnc +++ b/config-model/src/main/resources/schema/version/7.x/container.rnc @@ -23,11 +23,11 @@ Server = element server { } AccessControl = element access-control { - attribute domain { xsd:NCName }? & # TODO Vespa 8 Remove - attribute read { string "true" | string "false" }? & # TODO Vespa 8 Remove - attribute write { string "true" | string "false" }? & # TODO Vespa 8 Remove + attribute domain { xsd:NCName }? & + attribute read { string "true" | string "false" }? & + attribute write { string "true" | string "false" }? & attribute tls-handshake-client-auth {string "want" | string "need"}? & - element vespa-domain { xsd:NCName }? & # TODO Remove after end of March 2020 + element vespa-domain { xsd:NCName }? & element exclude { Binding+ }? diff --git a/config-model/src/main/resources/schema/version/7.x/content.rnc b/config-model/src/main/resources/schema/version/7.x/content.rnc index 8dd5f5c042f..a2b1bd908ec 100644 --- a/config-model/src/main/resources/schema/version/7.x/content.rnc +++ b/config-model/src/main/resources/schema/version/7.x/content.rnc @@ -83,10 +83,10 @@ ClusterControllerTuning = element cluster-controller { DispatchTuning = element dispatch { element max-hits-per-partition { xsd:nonNegativeInteger }? & element dispatch-policy { string "round-robin" | string "adaptive" | string "random" }? & - element min-group-coverage { xsd:double }? & # TODO: Ignored, remove on Vespa 8 + element min-group-coverage { xsd:double }? & element min-active-docs-coverage { xsd:double }? & element top-k-probability { xsd:double }? & - element use-local-node { string "true" | string "false" }? # TODO: Ignored, remove on Vespa 8 + element use-local-node { string "true" | string "false" }? } ClusterTuning = element tuning { diff --git a/config-model/src/main/resources/schema/version/7.x/federation.rnc b/config-model/src/main/resources/schema/version/7.x/federation.rnc index 15b57b9dd7b..8e341fa7a9c 100644 --- a/config-model/src/main/resources/schema/version/7.x/federation.rnc +++ b/config-model/src/main/resources/schema/version/7.x/federation.rnc @@ -17,7 +17,6 @@ Provider = attribute type { xsd:string }? & attribute cluster { xsd:string }? & - # TODO Vespa 8 Remove yca concepts from services.xml syntax attribute yca-application-id { xsd:string }? & attribute yca-cache-ttl { xsd:string { pattern = "\d+(\.\d*)?\s*m?s" } }? & attribute yca-cache-retry-wait { xsd:string { pattern = "\d+(\.\d*)?\s*m?s" } }? & |