Skip to content

Commit a1c99c5

Browse files
committed
Merge branch 'master' into fix-index-head
* master: Fix alias HEAD requests Upgrade to lucene-6.5.0-snapshot-f919485. (elastic#23087) Add BulkProcessor methods with XContentType parameter (elastic#23078)
2 parents 54854bf + 7ac4465 commit a1c99c5

File tree

72 files changed

+307
-225
lines changed

Some content is hidden

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

72 files changed

+307
-225
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
22
elasticsearch = 6.0.0-alpha1
3-
lucene = 6.4.1
3+
lucene = 6.5.0-snapshot-f919485
44

55
# optional dependencies
66
spatial4j = 0.6

core/licenses/lucene-analyzers-common-6.4.1.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+
886c1da9adc3347f61ab95ecbf4dbeeaa0e7acb2

core/licenses/lucene-backward-codecs-6.4.1.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+
df9e94f63ad7d9188f14820c435ea1dc3c28d87a

core/licenses/lucene-core-6.4.1.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+
3539f8dc9c3ed8ebe90afcb3daa2e9afcf5108d1

core/licenses/lucene-grouping-6.4.1.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+
da76338e4f299963da9d7ab33dae7586dfc902c2

core/licenses/lucene-highlighter-6.4.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)