Skip to content

Commit fe47a81

Browse files
committed
Merge branch 'main' of github.com:elastic/elasticsearch into esql-usage-limit-v3
2 parents b414480 + 8f72b23 commit fe47a81

File tree

176 files changed

+6035
-2462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+6035
-2462
lines changed

docs/changelog/137599.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 137599
2+
summary: In-response-to in saml successful response
3+
area: Authentication
4+
type: enhancement
5+
issues:
6+
- 128179

docs/changelog/139071.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 139071
2+
summary: Change FUSE KEY BY to receive a list of `qualifiedName`
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/139087.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 139087
2+
summary: Disk bbq license enforcement
3+
area: Vector Search
4+
type: bug
5+
issues: []

docs/reference/elasticsearch/rest-apis/retrievers/diversify-retriever.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ The ordering of results returned from the inner retriever is preserved.
5050

5151
Query vector. Must have the same number of dimensions as the vector field you are searching against.
5252
Must be either an array of floats or a hex-encoded byte vector.
53+
If you provide a `query_vector`, you cannot also provide a `query_vector_builder`.
54+
55+
`query_vector_builder`
56+
: (Optional, query vector builder object)
57+
58+
Defines a [model](docs-content://solutions/search/vector/knn.md#knn-semantic-search) to build a query vector.
59+
If you provide a `query_vector_builder`, you cannot also provide a `query_vector`.
60+
5361

5462
`lambda`
5563
: (Required for `mmr`, float)

docs/reference/query-languages/esql/_snippets/functions/parameters/absent_over_time.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/delta.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/deriv.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/idelta.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/increase.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/irate.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)