Skip to content

Commit f0cb12a

Browse files
authored
Revert "Update docs to refer to 6.8 instead of 6.7 (#43685)" (#46720)
This reverts commit 8b0237d, which incorrectly stated that a rolling upgrade from 6.8 to 7.0 would work. Rolling upgrades from 6.8 must be done to 7.1+.
1 parent 6146d0f commit f0cb12a

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

docs/reference/mapping/removal_of_types.asciidoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ Elasticsearch 6.x::
258258

259259
* The `_default_` mapping type is deprecated.
260260

261-
* In 6.8, the index creation, index template, and mapping APIs support a query
261+
* In 6.7, the index creation, index template, and mapping APIs support a query
262262
string parameter (`include_type_name`) which indicates whether requests and
263263
responses should include a type name. It defaults to `true`, and should be set
264264
to an explicit value to prepare to upgrade to 7.0. Not setting `include_type_name`
@@ -444,12 +444,12 @@ documents to it using typeless `index` calls, and load documents with typeless
444444

445445
Index creation, index template, and mapping APIs support a new `include_type_name`
446446
URL parameter that specifies whether mapping definitions in requests and responses
447-
should contain the type name. The parameter defaults to `true` in version 6.8 to
447+
should contain the type name. The parameter defaults to `true` in version 6.7 to
448448
match the pre-7.0 behavior of using type names in mappings. It defaults to `false`
449449
in version 7.0 and will be removed in version 8.0.
450450

451-
It should be set explicitly in 6.8 to prepare to upgrade to 7.0. To avoid deprecation
452-
warnings in 6.8, the parameter can be set to either `true` or `false`. In 7.0, setting
451+
It should be set explicitly in 6.7 to prepare to upgrade to 7.0. To avoid deprecation
452+
warnings in 6.7, the parameter can be set to either `true` or `false`. In 7.0, setting
453453
`include_type_name` at all will result in a deprecation warning.
454454

455455
See some examples of interactions with Elasticsearch with this option set to `false`:
@@ -719,12 +719,12 @@ indices.
719719
[float]
720720
==== Mixed-version clusters
721721

722-
In a cluster composed of both 6.8 and 7.0 nodes, the parameter
722+
In a cluster composed of both 6.7 and 7.0 nodes, the parameter
723723
`include_type_name` should be specified in indices APIs like index
724724
creation. This is because the parameter has a different default between
725-
6.8 and 7.0, so the same mapping definition will not be valid for both
725+
6.7 and 7.0, so the same mapping definition will not be valid for both
726726
node versions.
727727

728728
Typeless document APIs such as `bulk` and `update` are only available as of
729-
7.0, and will not work with 6.8 nodes. This also holds true for the typeless
729+
7.0, and will not work with 6.7 nodes. This also holds true for the typeless
730730
versions of queries that perform document lookups, such as `terms`.

docs/reference/upgrade/cluster_restart.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ To upgrade directly to {es} {version} from versions 6.0-6.6, you must shut down
55
all nodes in the cluster, upgrade each node to {version}, and restart the cluster.
66

77
NOTE: If you are running a version prior to 6.0,
8-
{stack-ref-68}/upgrading-elastic-stack.html[upgrade to 6.8]
8+
https://www.elastic.co/guide/en/elastic-stack/6.7/upgrading-elastic-stack.html[upgrade to 6.7]
99
and reindex your old indices or bring up a new {version} cluster and
1010
<<reindex-upgrade-remote, reindex from remote>>.
1111

docs/reference/upgrade/reindex_upgrade.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ been deleted.
3636
[[reindex-upgrade-inplace]]
3737
=== Reindex in place
3838

39-
You can use the Upgrade Assistant in {kib} 6.8 to automatically reindex 5.x
39+
You can use the Upgrade Assistant in {kib} 6.7 to automatically reindex 5.x
4040
indices you need to carry forward to {version}.
4141

4242
To manually reindex your old indices in place:
@@ -103,7 +103,7 @@ endif::include-xpack[]
103103

104104
You can use <<reindex-from-remote,reindex from remote>> to migrate indices from
105105
your old cluster to a new {version} cluster. This enables you move to {version}
106-
from a pre-6.8 cluster without interrupting service.
106+
from a pre-6.7 cluster without interrupting service.
107107

108108
[WARNING]
109109
=============================================
@@ -196,4 +196,4 @@ monitor progress of the reindex job with the <<tasks,task API>>:
196196
`30s` and `1`).
197197

198198
.. Once reindexing is complete and the status of the new index is `green`,
199-
you can delete the old index.
199+
you can delete the old index.

docs/reference/upgrade/rolling_upgrade.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ running the older version.
1010
Rolling upgrades are supported:
1111

1212
* Between minor versions
13-
* {stack-ref-68}/upgrading-elastic-stack.html[From 5.6 to 6.8]
14-
* From 6.8 to {version}
13+
* https://www.elastic.co/guide/en/elastic-stack/6.7/upgrading-elastic-stack.html[From 5.6 to 6.7]
14+
* From 6.7 to {version}
1515

1616
Upgrading directly to {version} from 6.6 or earlier requires a
1717
<<restart-upgrade, full cluster restart>>.

0 commit comments

Comments
 (0)