Skip to content

Commit c5b9f2a

Browse files
jdconradjdconrad
committed
Merge branch 'main' into exclusive2
2 parents 6f14915 + af364a4 commit c5b9f2a

File tree

235 files changed

+12857
-4271
lines changed

Some content is hidden

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

235 files changed

+12857
-4271
lines changed

‎docs/changelog/119995.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 119995
2+
summary: "apm-data: Use representative count as event.success_count if available"
3+
area: Ingest Node
4+
type: bug
5+
issues: []

‎docs/changelog/122134.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122134
2+
summary: Adding integration for VoyageAI embeddings and rerank models
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/122586.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 122586
2+
summary: "ESQL: Fix inconsistent results in using scaled_float field"
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 122547

‎docs/changelog/122601.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 122601
2+
summary: Implicit numeric casting for CASE/GREATEST/LEAST
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 121890

‎docs/changelog/122938.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122938
2+
summary: Fix geoip databases index access after system feature migration (again)
3+
area: Ingest Node
4+
type: bug
5+
issues: []

‎docs/changelog/123010.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 123010
2+
summary: Hold store reference in `InternalEngine#performActionWithDirectoryReader(...)`
3+
area: Engine
4+
type: bug
5+
issues:
6+
- 122974

‎docs/changelog/123085.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123085
2+
summary: Remove duplicated nested commands
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎docs/changelog/123155.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123155
2+
summary: Add `ElasticInferenceServiceCompletionServiceSettings`
3+
area: Machine Learning
4+
type: bug
5+
issues: []

‎libs/entitlement/bridge/src/main/java/module-info.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
module org.elasticsearch.entitlement.bridge {
1313
requires java.net.http;
1414
requires jdk.net;
15+
requires java.logging;
1516

1617
exports org.elasticsearch.entitlement.bridge;
1718
}

‎libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
import java.util.concurrent.ForkJoinPool;
8989
import java.util.function.BiPredicate;
9090
import java.util.function.Consumer;
91+
import java.util.logging.FileHandler;
9192

9293
import javax.net.ssl.HostnameVerifier;
9394
import javax.net.ssl.HttpsURLConnection;
@@ -882,9 +883,34 @@ public interface EntitlementChecker {
882883

883884
void check$java_nio_file_Files$$lines(Class<?> callerClass, Path path);
884885

885-
// file system providers
886886
void check$java_nio_file_spi_FileSystemProvider$(Class<?> callerClass);
887887

888+
void check$java_util_logging_FileHandler$(Class<?> callerClass);
889+
890+
void check$java_util_logging_FileHandler$(Class<?> callerClass, String pattern);
891+
892+
void check$java_util_logging_FileHandler$(Class<?> callerClass, String pattern, boolean append);
893+
894+
void check$java_util_logging_FileHandler$(Class<?> callerClass, String pattern, int limit, int count);
895+
896+
void check$java_util_logging_FileHandler$(Class<?> callerClass, String pattern, int limit, int count, boolean append);
897+
898+
void check$java_util_logging_FileHandler$(Class<?> callerClass, String pattern, long limit, int count, boolean append);
899+
900+
void check$java_util_logging_FileHandler$close(Class<?> callerClass, FileHandler that);
901+
902+
void check$java_net_http_HttpRequest$BodyPublishers$$ofFile(Class<?> callerClass, Path path);
903+
904+
void check$java_net_http_HttpResponse$BodyHandlers$$ofFile(Class<?> callerClass, Path path);
905+
906+
void check$java_net_http_HttpResponse$BodyHandlers$$ofFile(Class<?> callerClass, Path path, OpenOption... options);
907+
908+
void check$java_net_http_HttpResponse$BodyHandlers$$ofFileDownload(Class<?> callerClass, Path directory, OpenOption... openOptions);
909+
910+
void check$java_net_http_HttpResponse$BodySubscribers$$ofFile(Class<?> callerClass, Path directory);
911+
912+
void check$java_net_http_HttpResponse$BodySubscribers$$ofFile(Class<?> callerClass, Path directory, OpenOption... openOptions);
913+
888914
void checkNewFileSystem(Class<?> callerClass, FileSystemProvider that, URI uri, Map<String, ?> env);
889915

890916
void checkNewFileSystem(Class<?> callerClass, FileSystemProvider that, Path path, Map<String, ?> env);

0 commit comments

Comments
 (0)