Skip to content

Commit 1e76873

Browse files
Mikep86Mikep86
committed
Merge branch 'main' into inference_metadata_fields
2 parents 9deee7e + 9472489 commit 1e76873

File tree

613 files changed

+20098
-4915
lines changed

Some content is hidden

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

613 files changed

+20098
-4915
lines changed

‎build-tools-internal/version.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ jna = 5.12.1
1717
netty = 4.1.115.Final
1818
commons_lang3 = 3.9
1919
google_oauth_client = 1.34.1
20+
awsv1sdk = 1.12.270
21+
awsv2sdk = 2.28.13
2022

2123
antlr4 = 4.13.1
2224
# bouncy castle version for non-fips. fips jars use a different version
@@ -33,7 +35,7 @@ commonscodec = 1.15
3335
protobuf = 3.25.5
3436

3537
# test dependencies
36-
randomizedrunner = 2.8.0
38+
randomizedrunner = 2.8.2
3739
junit = 4.13.2
3840
junit5 = 5.7.1
3941
hamcrest = 2.1

‎dev-tools/publish_zstd_binaries.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ build_linux_jar() {
7979
}
8080

8181
echo 'Building Linux jars...'
82-
LINUX_ARM_JAR=$(build_linux_jar "linux/amd64" "x86-64")
83-
LINUX_X86_JAR=$(build_linux_jar "linux/arm64" "aarch64")
82+
LINUX_ARM_JAR=$(build_linux_jar "linux/arm64" "aarch64")
83+
LINUX_X86_JAR=$(build_linux_jar "linux/amd64" "x86-64")
8484

8585
build_windows_jar() {
8686
ARTIFACT="$TEMP/zstd-$VERSION-windows-x86-64.jar"

‎distribution/tools/plugin-cli/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dependencies {
2525
implementation project(":libs:plugin-api")
2626
implementation project(":libs:plugin-scanner")
2727
// TODO: asm is picked up from the plugin scanner, we should consolidate so it is not defined twice
28-
implementation 'org.ow2.asm:asm:9.7'
29-
implementation 'org.ow2.asm:asm-tree:9.7'
28+
implementation 'org.ow2.asm:asm:9.7.1'
29+
implementation 'org.ow2.asm:asm-tree:9.7.1'
3030

3131
api "org.bouncycastle:bcpg-fips:1.0.7.1"
3232
api "org.bouncycastle:bc-fips:1.0.2.5"

‎docs/changelog/111104.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 111104
2+
summary: "ESQL: Enable async get to support formatting"
3+
area: ES|QL
4+
type: feature
5+
issues:
6+
- 110926

‎docs/changelog/117359.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117359
2+
summary: Term query for ES|QL
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/117555.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117555
2+
summary: Expand type compatibility for match function and operator
3+
area: ES|QL
4+
type: feature
5+
issues: []

‎docs/changelog/117575.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117575
2+
summary: Fix enrich cache size setting name
3+
area: Ingest Node
4+
type: bug
5+
issues: []

‎docs/changelog/117589.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117589
2+
summary: "Add Inference Unified API for chat completions for OpenAI"
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/117657.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117657
2+
summary: Ignore cancellation exceptions
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎docs/changelog/117920.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 117920
2+
summary: Wait for the worker service to shutdown before closing task processor
3+
area: Machine Learning
4+
type: bug
5+
issues:
6+
- 117563

0 commit comments

Comments
 (0)