Skip to content

Commit 88e60eb

Browse files
fixup
1 parent 8b549ff commit 88e60eb

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

website/content/docs/upgrading/instructions/index.mdx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ to plan your upgrade, starting from the next version and working
2121
upwards to your target version.
2222

2323
For example, to upgrade from Consul 1.12 to Consul 1.15:
24+
2425
1. Upgrade to Consul 1.14 as an intermediate step.
2526
To plan, review the upgrade details for
2627
[1.13](/consul/docs/upgrading/upgrade-specific#consul-1-13-x) and
2728
[1.14](/consul/docs/upgrading/upgrade-specific#consul-1-14-x).
28-
2. Upgrade to Consul 1.15.
29+
1. Upgrade to Consul 1.15.
2930
To plan, review the upgrade details for
3031
[1.15](/consul/docs/upgrading/upgrade-specific#consul-1-15-x).
3132

@@ -37,10 +38,10 @@ to a destination version.
3738

3839
| Starting Version Range | Destination Version | Upgrade Instructions |
3940
| ---------------------- | ------------------- | -------------------- |
40-
| 1.8.0 - 1.9.17 | 1.10.12 | Follow the [instructions for upgrading to final 1.10.x](/consul/docs/upgrading/instructions/upgrade-to-1-10-x) |
41-
| 1.6.9 - 1.8.18 | 1.8.19 | Follow the [instructions for upgrading to final 1.8.x](/consul/docs/upgrading/instructions/upgrade-to-1-8-x) |
42-
| 1.2.4 - 1.6.9 | 1.6.10 | Follow the [instructions for upgrading to final 1.6.x](/consul/docs/upgrading/instructions/upgrade-to-1-6-x) |
43-
| 0.8.5 - 1.2.3 | 1.2.4 | Follow the [instructions for upgrading to final 1.2.x](/consul/docs/upgrading/instructions/upgrade-to-1-2-x) |
41+
| 1.8.0 - 1.9.17 | 1.10.12 | Refer to [upgrading to latest 1.10.x](/consul/docs/upgrading/instructions/upgrade-to-1-10-x) |
42+
| 1.6.9 - 1.8.18 | 1.8.19 | Refer to [upgrading to latest 1.8.x](/consul/docs/upgrading/instructions/upgrade-to-1-8-x) |
43+
| 1.2.4 - 1.6.9 | 1.6.10 | Refer to [upgrading to latest 1.6.x](/consul/docs/upgrading/instructions/upgrade-to-1-6-x) |
44+
| 0.8.5 - 1.2.3 | 1.2.4 | Refer to [upgrading to latest 1.2.x](/consul/docs/upgrading/instructions/upgrade-to-1-2-x) |
4445

4546
For example, to upgrade from Consul 1.3.1 to latest 1.12:
4647
1. Upgrade to Consul 1.6.10 using the dedicated instructions.

website/content/docs/upgrading/upgrade-specific.mdx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,13 @@ to Consul 1.11.11 or later to avoid the breaking nature of that change.
515515

516516
### Licensing Changes <EnterpriseAlert inline />
517517

518-
You can only upgrade to Consul Enterprise 1.10 from a version of
519-
Consul Enterprise 1.8 >= 1.8.13 or 1.9 >= 1.9.7. Other versions of
520-
Consul Enterprise are not forward compatible with v1.10 and will
521-
cause issues during the upgrade that could result in agents failing to start due to [changes in the way we manage licenses](/consul/docs/enterprise/license/faq).
518+
You can only upgrade to Consul Enterprise 1.10 from the following Enterprise versions:
519+
- 1.8 release series: 1.8.13+
520+
- 1.9 release series: 1.9.7+
521+
522+
Other versions of Consul Enterprise are not forward compatible with v1.10 and will
523+
cause issues during the upgrade that could result in agents failing to start due to
524+
[changes in the way we manage licenses](/consul/docs/enterprise/license/faq).
522525

523526
Consul Enterprise 1.10 has removed temporary licensing capabilities from the binaries
524527
found on https://releases.hashicorp.com. Servers will no longer load a license previously

0 commit comments

Comments
 (0)