Merge branch 'main' into take-date-nanos-implicit-casting-out-of-snapshot

Author: fang-xing-esql

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

@@ -17,8 +17,8 @@
 /**
  * Accessor for shared dependency versions used by elasticsearch, namely the elasticsearch and lucene versions.
  *
- * @deprecated use ext values set by {@link org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin} or
- * {@link org.elasticsearch.gradle.internal.conventions.VersionPropertiesBuildService}
+ * @deprecated use ext values set by org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin or
+ * org.elasticsearch.gradle.internal.conventions.VersionPropertiesBuildService
  *
  */
 @Deprecated

docs/changelog/133675.yaml

@@ -0,0 +1,5 @@
+pr: 133675
+summary: Support using the semantic query across multiple inference IDs
+area: Vector Search
+type: enhancement
+issues: []

docs/changelog/133919.yaml

@@ -0,0 +1,5 @@
+pr: 133919
+summary: Fix double-counting of inference memory in the assignment rebalancer
+area: Machine Learning
+type: bug
+issues: []

docs/changelog/133930.yaml

@@ -0,0 +1,6 @@
+pr: 133930
+summary: Improve memory estimation methods accuracy in `TrainedModelAssignmentRebalancer`
+  and related classes
+area: Machine Learning
+type: bug
+issues: []

muted-tests.yml

@@ -543,6 +543,12 @@ tests:
 - class: org.elasticsearch.xpack.esql.action.RandomizedTimeSeriesIT
   method: testRateGroupBySubset
   issue: https://github.com/elastic/elasticsearch/issues/134019
+- class: org.elasticsearch.xpack.cluster.routing.allocation.DataTierAllocationDeciderIT
+  method: testDesiredNodesAreTakenIntoAccountInAutoExpandReplicas
+  issue: https://github.com/elastic/elasticsearch/issues/134049
+- class: org.elasticsearch.xpack.cluster.routing.allocation.DataTierAllocationDeciderIT
+  method: testShardsAreKeptInPreferredTierUntilTheNextTierIsInItsFinalState
+  issue: https://github.com/elastic/elasticsearch/issues/134050
 
 # Examples:
 #

server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/NodeJoiningIT.java

@@ -356,6 +356,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = def(9_147_0_00);
     public static final TransportVersion STREAMS_ENDPOINT_PARAM_RESTRICTIONS = def(9_148_0_00);
     public static final TransportVersion RESOLVE_INDEX_MODE_FILTER = def(9_149_0_00);
+    public static final TransportVersion SEMANTIC_QUERY_MULTIPLE_INFERENCE_IDS = def(9_150_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,