Skip to content

Commit 3b6d0ce

Browse files
committed
Merge branch 'master' into ccr
* master: (25 commits) Disable bwc tests in preparation of backporting #26931 TemplateUpgradeService should only run on the master (#27294) Die with dignity while merging Fix profiling naming issues (#27133) Correctly encode warning headers Fixed references to Multi Index Syntax (#27283) Add an active Elasticsearch WordPress plugin link (#27279) Setting url parts as required to reflect the code base (#27263) keys in aggs percentiles need to be in quotes. (#26905) Align routing param type with search.json (#26958) Update to support bulk updates by query (#27172) Remove duplicated SnapshotStatus (#27276) add split index reference in indices.asciidoc Add ability to split shards (#26931) [Docs] Fix minor paragraph indentation error for multiple Indices params (#25535) Upgrade to Jackson 2.8.10 (#27230) Fix inconsistencies in the rest api specs for `tasks` (#27163) Adjust RestHighLevelClient method modifiers (#27238) Remove unused parameters in AnalysisRegistry (#27232) Add more information on `_failed_to_convert_` exception (#27034) ...
2 parents e61e4b8 + 2fc6c64 commit 3b6d0ce

File tree

148 files changed

+4451
-1569
lines changed

Some content is hidden

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

148 files changed

+4451
-1569
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ task verifyVersions {
186186
* after the backport of the backcompat code is complete.
187187
*/
188188
allprojects {
189-
ext.bwc_tests_enabled = true
189+
ext.bwc_tests_enabled = false
190190
}
191191

192192
task verifyBwcTestsEnabled {

buildSrc/version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ lucene = 7.1.0
55
# optional dependencies
66
spatial4j = 0.6
77
jts = 1.13
8-
jackson = 2.8.6
9-
snakeyaml = 1.15
8+
jackson = 2.8.10
9+
snakeyaml = 1.17
1010
# when updating log4j, please update also docs/java-api/index.asciidoc
1111
log4j = 2.9.1
1212
slf4j = 1.6.2

client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java

Lines changed: 29 additions & 27 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eb21a035c66ad307e66ec8fce37f5d50fd62d039

client/sniffer/licenses/jackson-core-2.8.6.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eb21a035c66ad307e66ec8fce37f5d50fd62d039

core/licenses/jackson-core-2.8.6.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1c58cc9313ddf19f0900cd61ed044874278ce320

core/licenses/jackson-dataformat-cbor-2.8.6.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e853081fadaad3e98ed801937acc3d8f77580686

0 commit comments

Comments
 (0)