Skip to content

Commit 30d92d1

Browse files
jasontedorjasontedor
committed
Merge branch 'master' into package-ingest-geoip-as-a-module
* master: (31 commits) Move ingest-geoip default databases out of config (elastic#36949) [ILM][DOCS] add extra scenario to policy update docs (elastic#36871) [Painless] Add String Casting Tests (elastic#36945) SQL: documentation improvements and updates (elastic#36918) [DOCS] Merges list of discovery and cluster formation settings (elastic#36909) Only compress responses if request was compressed (elastic#36867) Remove duplicate paragraph (elastic#36942) Fix URI to cluster stats endpoint on specific nodes (elastic#36784) Fix typo in unitTest task (elastic#36930) RecoveryMonitor#lastSeenAccessTime should be volatile (elastic#36781) [CCR] Add `ccr.auto_follow_coordinator.wait_for_timeout` setting (elastic#36714) Scripting: Remove deprecated params.ctx (elastic#36848) Refactor the REST actions to clarify what endpoints are deprecated. (elastic#36869) Add JDK 12 to CI rotation (elastic#36915) Improve error message for 6.x style realm settings (elastic#36876) Send clear session as routable remote request (elastic#36805) [DOCS] Remove redundant ILM attributes (elastic#36808) SQL: Fix bug regarding histograms usage in scripting (elastic#36866) Update index mappings when ccr restore complete (elastic#36879) Docs: Bump version to alpha2 after release ...
2 parents ce5320e + 6781a29 commit 30d92d1

File tree

259 files changed

+3208
-1373
lines changed

Some content is hidden

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

259 files changed

+3208
-1373
lines changed

‎.ci/matrix-build-javas.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77

88
ES_BUILD_JAVA:
99
- java11
10+
- openjdk12

‎.ci/matrix-runtime-javas.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ ES_RUNTIME_JAVA:
99
- java8
1010
- java8fips
1111
- java11
12+
- openjdk12
1213
- zulu8
1314
- zulu11

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ static Request count(CountRequest countRequest) throws IOException {
479479
}
480480

481481
static Request explain(ExplainRequest explainRequest) throws IOException {
482-
String endpoint = explainRequest.isTypeless()
482+
String endpoint = explainRequest.type().equals(MapperService.SINGLE_MAPPING_NAME)
483483
? endpoint(explainRequest.index(), "_explain", explainRequest.id())
484484
: endpoint(explainRequest.index(), explainRequest.type(), explainRequest.id(), "_explain");
485485
Request request = new Request(HttpGet.METHOD_NAME, endpoint);

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SecurityDocumentationIT.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,6 @@ public void onFailure(Exception e) {
13181318
}
13191319
}
13201320

1321-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/36362")
13221321
public void testInvalidateToken() throws Exception {
13231322
RestHighLevelClient client = highLevelClient();
13241323

‎distribution/packages/build.gradle‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,6 @@ Closure commonPackageConfig(String type, boolean oss) {
173173
configurationFile '/etc/elasticsearch/users'
174174
configurationFile '/etc/elasticsearch/users_roles'
175175
}
176-
configurationFile '/etc/elasticsearch/ingest-geoip'
177-
configurationFile '/etc/elasticsearch/ingest-geoip/GeoLite2-ASN.mmdb'
178-
configurationFile '/etc/elasticsearch/ingest-geoip/GeoLite2-City.mmdb'
179-
configurationFile '/etc/elasticsearch/ingest-geoip/GeoLite2-Country.mmdb'
180176
into('/etc/elasticsearch') {
181177
dirMode 0750
182178
fileMode 0660

‎docs/Versions.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:version: 7.0.0-alpha1
1+
:version: 7.0.0-alpha2
22
:major-version: 7.x
33
:lucene_version: 8.0.0
44
:lucene_version_path: 8_0_0

‎docs/reference/ccr/apis/auto-follow/delete-auto-follow-pattern.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-delete-auto-follow-pattern]]
4-
=== Delete Auto-Follow Pattern API
4+
=== Delete auto-follow pattern API
55
++++
6-
<titleabbrev>Delete Auto-Follow Pattern</titleabbrev>
6+
<titleabbrev>Delete auto-follow pattern</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/auto-follow/get-auto-follow-pattern.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-get-auto-follow-pattern]]
4-
=== Get Auto-Follow Pattern API
4+
=== Get auto-follow pattern API
55
++++
6-
<titleabbrev>Get Auto-Follow Pattern</titleabbrev>
6+
<titleabbrev>Get auto-follow pattern</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/auto-follow/put-auto-follow-pattern.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-put-auto-follow-pattern]]
4-
=== Create Auto-Follow Pattern API
4+
=== Create auto-follow pattern API
55
++++
6-
<titleabbrev>Create Auto-Follow Pattern</titleabbrev>
6+
<titleabbrev>Create auto-follow pattern</titleabbrev>
77
++++
88

99
beta[]

‎docs/reference/ccr/apis/follow/get-follow-stats.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[role="xpack"]
22
[testenv="platinum"]
33
[[ccr-get-follow-stats]]
4-
=== Get Follower Stats API
4+
=== Get follower stats API
55
++++
6-
<titleabbrev>Get Follower Stats</titleabbrev>
6+
<titleabbrev>Get follower stats</titleabbrev>
77
++++
88

99
beta[]

0 commit comments

Comments
 (0)