Skip to content

Commit b87fd55

Browse files
authored
Merge branch 'main' into kderusso/refactor-lucene-query-evaluators-to-blocks
2 parents 2b2dbcf + f5759b1 commit b87fd55

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ RUN <%= retry.loop(package_manager,
110110
" ${package_manager} update && \n" +
111111
" ${package_manager} upgrade && \n" +
112112
" ${package_manager} add --no-cache \n" +
113-
" bash java-cacerts curl libstdc++ libsystemd netcat-openbsd p11-kit p11-kit-trust posix-libc-utils shadow tini unzip zip zstd && \n" +
113+
" bash java-cacerts curl libstdc++ libsystemd netcat-openbsd p11-kit p11-kit-trust posix-libc-utils shadow tini unzip zip zstd wget && \n" +
114114
" rm -rf /var/cache/apk/* "
115115
) %>
116116

server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ public boolean newDynamicStringField(DocumentParserContext context, String name)
339339
new TextFieldMapper.Builder(
340340
name,
341341
indexSettings.getIndexVersionCreated(),
342+
indexSettings.getMode(),
342343
context.indexAnalyzers(),
343344
SourceFieldMapper.isSynthetic(indexSettings),
344345
false

0 commit comments

Comments
 (0)