backport of commit 06880bd (#15640)

Co-authored-by: skpratt <sarah.pratt@hashicorp.com>
hashicorp · Dec 8, 2022 · fa095f3 · fa095f3
1 parent f056eed
commit fa095f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/website/content/docs/enterprise/license/faq.mdx b/website/content/docs/enterprise/license/faq.mdx
@@ -72,6 +72,9 @@ Consul will only cease operation after license *termination*, which occurs 10 ye
 after license expiration and is defined in
 [`termination_time`](/api-docs/operator/license#getting-the-consul-license).
 
+~> **Starting with Consul 1.14, and patch releases 1.13.3 and 1.12.6, Consul will support non-terminating licenses**:
+   Please contact your support representative for more details on non-terminating licenses.
+
 ## Q: Does this affect client agents?
 
 There are upgrade requirements that affect Consul Enterprise clients.

diff --git a/website/content/docs/enterprise/upgrades.mdx b/website/content/docs/enterprise/upgrades.mdx
@@ -5,6 +5,10 @@ description: >-
   Automated upgrades simplify the process for updating Consul. Learn how Consul can gracefully transition from existing server agents to a new set of server agents without Consul downtime.
 ---
 
+~> **Starting with Consul 1.14, and patch releases 1.13.3 and 1.12.6, Consul will disallow upgrades to new versions with a release date after license expiration**:
+   If you are looking to upgrade to a version of Consul that was released after your license expired, please be sure to renew your license before attempting an upgrade.
+
+
 # Automated Upgrades
 
 <EnterpriseAlert>