Skip to content

Commit b6b6da5

Browse files
weizijunweizijun
committed
Merge branch 'upstream/main' into add-alibabacloud-inference
* upstream/main: (91 commits) Mute org.elasticsearch.xpack.test.rest.XPackRestIT org.elasticsearch.xpack.test.rest.XPackRestIT elastic#111944 Add audit_unenrolled_* attributes to fleet-agents template (elastic#111909) Fix windows memory locking (elastic#111866) Update OAuth2 OIDC SDK (elastic#108799) Adds a warning about manually mounting snapshots managed by ILM (elastic#111883) Update geoip fixture files and utility methods (elastic#111913) Updated Function Score Query Test with Explain Fixes for 8.15.1 (elastic#111929) Mute org.elasticsearch.xpack.sql.qa.security.JdbcCsvSpecIT org.elasticsearch.xpack.sql.qa.security.JdbcCsvSpecIT elastic#111923 [ESQL] date nanos binary comparisons (elastic#111908) [DOCS] Documents output_field behavior after multiple inference runs (elastic#111875) Add additional BlobCacheMetrics, expose BlobCacheMetrics via SharedBlobCacheService (elastic#111730) Mute org.elasticsearch.xpack.sql.qa.multi_cluster_with_security.JdbcCsvSpecIT org.elasticsearch.xpack.sql.qa.multi_cluster_with_security.JdbcCsvSpecIT elastic#111923 Mute org.elasticsearch.xpack.sql.qa.multi_cluster_with_security.JdbcCsvSpecIT test {agg-ordering.testHistogramDateTimeWithCountAndOrder_2} elastic#111919 Mute org.elasticsearch.xpack.sql.qa.multi_cluster_with_security.JdbcCsvSpecIT test {date.testDateParseHaving} elastic#111921 Mute org.elasticsearch.xpack.sql.qa.multi_cluster_with_security.JdbcCsvSpecIT test {agg-ordering.testHistogramDateTimeWithCountAndOrder_1} elastic#111918 Mute org.elasticsearch.xpack.sql.qa.multi_cluster_with_security.JdbcCsvSpecIT test {datetime.testDateTimeParseHaving} elastic#111922 Mute org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT elastic#111923 Mute org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT test {agg-ordering.testHistogramDateTimeWithCountAndOrder_1} elastic#111918 Mute org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT test {datetime.testDateTimeParseHaving} elastic#111922 Mute org.elasticsearch.xpack.sql.qa.single_node.JdbcCsvSpecIT test {date.testDateParseHaving} elastic#111921 ... # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java
2 parents 4528f9e + 445be15 commit b6b6da5

File tree

1,057 files changed

+7227
-3592
lines changed

Some content is hidden

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

1,057 files changed

+7227
-3592
lines changed

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/TransportNoopBulkAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import org.elasticsearch.action.support.ActionFilters;
1717
import org.elasticsearch.action.support.HandledTransportAction;
1818
import org.elasticsearch.action.update.UpdateResponse;
19-
import org.elasticsearch.common.inject.Inject;
2019
import org.elasticsearch.common.util.concurrent.EsExecutors;
2120
import org.elasticsearch.index.shard.ShardId;
21+
import org.elasticsearch.injection.guice.Inject;
2222
import org.elasticsearch.plugin.noop.NoopPlugin;
2323
import org.elasticsearch.tasks.Task;
2424
import org.elasticsearch.transport.TransportService;

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/TransportNoopSearchAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.elasticsearch.action.search.ShardSearchFailure;
1414
import org.elasticsearch.action.support.ActionFilters;
1515
import org.elasticsearch.action.support.HandledTransportAction;
16-
import org.elasticsearch.common.inject.Inject;
1716
import org.elasticsearch.common.io.stream.Writeable;
1817
import org.elasticsearch.common.util.concurrent.EsExecutors;
18+
import org.elasticsearch.injection.guice.Inject;
1919
import org.elasticsearch.plugin.noop.NoopPlugin;
2020
import org.elasticsearch.search.SearchHits;
2121
import org.elasticsearch.search.aggregations.InternalAggregations;

‎docs/changelog/110548.yaml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎docs/changelog/111437.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 111437
2+
summary: "[ES|QL] Create `Range` in `PushFiltersToSource` for qualified pushable filters on the same field"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/111689.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 111689
2+
summary: Add nanos support to `ZonedDateTime` serialization
3+
area: Infra/Core
4+
type: enhancement
5+
issues:
6+
- 68292

‎docs/changelog/111729.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 111729
2+
summary: Speed up dense/sparse vector stats
3+
area: Vector Search
4+
type: bug
5+
issues:
6+
- 111715

‎docs/changelog/111740.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 111740
2+
summary: Fix Start Trial API output acknowledgement header for features
3+
area: License
4+
type: bug
5+
issues:
6+
- 111739

‎docs/changelog/111756.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 111756
2+
summary: Fix `NullPointerException` when doing knn search on empty index without dims
3+
area: Vector Search
4+
type: bug
5+
issues:
6+
- 111733

‎docs/changelog/111758.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 111758
2+
summary: Revert "Avoid bucket copies in Aggs"
3+
area: Aggregations
4+
type: bug
5+
issues:
6+
- 111679

‎docs/changelog/111779.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pr: 111779
2+
summary: "ESQL: Fix serialization during `can_match`"
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 111701
7+
- 111726

0 commit comments

Comments
 (0)