Skip to content

Commit e2ed57b

Browse files
thecoopthecoop
committed
Merge branch 'main' into lucene_snapshot
2 parents d7fef7d + b9620da commit e2ed57b

File tree

91 files changed

+1736
-935
lines changed

Some content is hidden

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

91 files changed

+1736
-935
lines changed

‎build-tools/src/main/java/org/elasticsearch/gradle/VersionProperties.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
/**
1818
* Accessor for shared dependency versions used by elasticsearch, namely the elasticsearch and lucene versions.
1919
*
20-
* @deprecated use ext values set by {@link org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin} or
21-
* {@link org.elasticsearch.gradle.internal.conventions.VersionPropertiesBuildService}
20+
* @deprecated use ext values set by org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin or
21+
* org.elasticsearch.gradle.internal.conventions.VersionPropertiesBuildService
2222
*
2323
*/
2424
@Deprecated

‎docs/changelog/133675.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133675
2+
summary: Support using the semantic query across multiple inference IDs
3+
area: Vector Search
4+
type: enhancement
5+
issues: []

‎docs/changelog/133919.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133919
2+
summary: Fix double-counting of inference memory in the assignment rebalancer
3+
area: Machine Learning
4+
type: bug
5+
issues: []

‎docs/changelog/133930.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 133930
2+
summary: Improve memory estimation methods accuracy in `TrainedModelAssignmentRebalancer`
3+
and related classes
4+
area: Machine Learning
5+
type: bug
6+
issues: []

‎docs/reference/query-languages/esql/_snippets/functions/examples/knn.md‎

Lines changed: 1 addition & 1 deletion
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/functionNamedParams/knn.md‎

Lines changed: 3 additions & 3 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/knn.md‎

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

‎docs/reference/query-languages/esql/images/functions/knn.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎docs/reference/query-languages/esql/kibana/definition/functions/knn.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/query-languages/esql/kibana/docs/functions/knn.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)