Skip to content

Commit ffed86a

Browse files
committed
Fix merge
1 parent a48b12f commit ffed86a

File tree

5 files changed

+2224
-1919
lines changed

5 files changed

+2224
-1919
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ static TransportVersion def(int id) {
246246
* Reference to the minimum transport version that can be used with CCS.
247247
* This should be the transport version used by the previous minor release.
248248
*/
249-
public static final TransportVersion MINIMUM_CCS_VERSION = FIX_VECTOR_SIMILARITY_INNER_HITS_BACKPORT_8_15;
249+
public static final TransportVersion MINIMUM_CCS_VERSION = V_8_15_0;
250250

251251
static final NavigableMap<Integer, TransportVersion> VERSION_IDS = getAllVersionIds(TransportVersions.class);
252252

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp

Lines changed: 14 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)