Skip to content

Commit 85178c6

Browse files
committed
Merge branch 'popraw' of github.com:iverase/elasticsearch into popraw
2 parents 102b74a + 6c99678 commit 85178c6

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

muted-tests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,12 @@ tests:
537537
- class: org.elasticsearch.xpack.logsdb.LogsIndexingIT
538538
method: testShrink
539539
issue: https://github.com/elastic/elasticsearch/issues/133875
540+
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
541+
method: testPartialResults
542+
issue: https://github.com/elastic/elasticsearch/issues/131481
543+
- class: org.elasticsearch.xpack.ml.integration.ClassificationIT
544+
method: testWithCustomFeatureProcessors
545+
issue: https://github.com/elastic/elasticsearch/issues/134001
540546

541547
# Examples:
542548
#

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ static TransportVersion def(int id) {
354354
public static final TransportVersion SHARD_WRITE_LOAD_IN_CLUSTER_INFO = def(9_126_0_00);
355355
public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS = def(9_127_0_00);
356356
public static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = def(9_147_0_00);
357-
public static final TransportVersion STREAMS_ENDPOINT_PARAM_RESTRICTIONS = def(9_148_00_00);
357+
public static final TransportVersion STREAMS_ENDPOINT_PARAM_RESTRICTIONS = def(9_148_0_00);
358358

359359
/*
360360
* STOP! READ THIS FIRST! No, really,

0 commit comments

Comments
 (0)