Skip to content

Commit 5506cfd

Browse files
committed
Merge branch 'ccr' into engine-factory-provider
* ccr: (42 commits) [DOCS] Added info about snapshotting your data before an upgrade. Add documentation about disabling `_field_names`. (elastic#26813) Remove UnsortedNumericDoubleValues (elastic#26817) Fix IndexOutOfBoundsException in histograms for NaN doubles (elastic#26787) (elastic#26856) [TEST] Added skipping the `headers` feature to the Bulk REST YAML test Update type-field.asciidoc Fix search_after with geo distance sorting (elastic#26891) Use proper logging placeholder for Netty logging Add Netty channel information on write and flush failure Remove deploying in JBoss documentation Document JVM option MaxFDLimit for macOS () Add additional low-level logging handler () Unwrap causes when maybe dying Change log level on write and flush failure to warn [TEST] add test to ensure legacy list syntax in yml works fine Bump BWC version for settings serialization to 6.1.0 Removed void token filter entries and added two tests Added Bengali Analyzer to Elasticsearch with respect to the lucene update(PR#238) Fix toString() in SnapshotStatus (elastic#26852) elastic#26870 change bwc version for fuzzy_transpositions to 6.1 after backport ...
2 parents 0ba19c6 + b57cb83 commit 5506cfd

File tree

195 files changed

+2310
-1131
lines changed

Some content is hidden

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

195 files changed

+2310
-1131
lines changed

TESTING.asciidoc

Lines changed: 1 addition & 0 deletions

Vagrantfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ Vagrant.configure(2) do |config|
6464
config.vm.box = "elastic/fedora-25-x86_64"
6565
dnf_common config
6666
end
67+
config.vm.define "fedora-26" do |config|
68+
config.vm.box = "elastic/fedora-26-x86_64"
69+
dnf_common config
70+
end
6771
config.vm.define "opensuse-42" do |config|
6872
config.vm.box = "elastic/opensuse-42-x86_64"
6973
opensuse_common config

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ dependencies {
9292
compile 'com.netflix.nebula:gradle-info-plugin:3.0.3'
9393
compile 'org.eclipse.jgit:org.eclipse.jgit:3.2.0.201312181205-r'
9494
compile 'com.perforce:p4java:2012.3.551082' // THIS IS SUPPOSED TO BE OPTIONAL IN THE FUTURE....
95-
compile 'de.thetaphi:forbiddenapis:2.3'
95+
compile 'de.thetaphi:forbiddenapis:2.4.1'
9696
compile 'org.apache.rat:apache-rat:0.11'
9797
compile "org.elasticsearch:jna:4.4.0-1"
9898
}

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class VagrantTestPlugin implements Plugin<Project> {
2020
'debian-8',
2121
'debian-9',
2222
'fedora-25',
23+
'fedora-26',
2324
'oel-6',
2425
'oel-7',
2526
'opensuse-42',

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 = 7.0.0-alpha1
3-
lucene = 7.0.0
3+
lucene = 7.1.0-snapshot-f33ed4ba12a
44

55
# optional dependencies
66
spatial4j = 0.6

core/licenses/lucene-NOTICE.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,14 @@ The KStem stemmer in
5454
was developed by Bob Krovetz and Sergio Guzman-Lara (CIIR-UMass Amherst)
5555
under the BSD-license.
5656

57-
The Arabic,Persian,Romanian,Bulgarian, and Hindi analyzers (common) come with a default
57+
The Arabic,Persian,Romanian,Bulgarian, Hindi and Bengali analyzers (common) come with a default
5858
stopword list that is BSD-licensed created by Jacques Savoy. These files reside in:
5959
analysis/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt,
6060
analysis/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt,
6161
analysis/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt,
6262
analysis/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt,
63-
analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
63+
analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt,
64+
analysis/common/src/resources/org/apache/lucene/analysis/bn/stopwords.txt
6465
See http://members.unine.ch/jacques.savoy/clef/index.html.
6566

6667
The German,Spanish,Finnish,French,Hungarian,Italian,Portuguese,Russian and Swedish light stemmers

core/licenses/lucene-analyzers-common-7.0.0.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+
a59ac3bdd17becc848f319fb77994060661c2c71

core/licenses/lucene-backward-codecs-7.0.0.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+
47f560086db8683b5be26911fae3721d8b0da465

0 commit comments

Comments
 (0)