add emqx/emqx#12786

emqx · Mar 26, 2024 · 21bc09f · 21bc09f
1 parent f81bdd1
commit 21bc09f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/en_US/changes/changes-ce-v5.md b/en_US/changes/changes-ce-v5.md
@@ -142,7 +142,7 @@
 
 - [#12785](https://github.com/emqx/emqx/pull/12785) Added `timestamp_format` config option to log handers.
 
-This new config supports the following values:
+This new option supports the following values:
 
 - `auto`: Automatically determines the timestamp format based on the log formatter being used.
   Utilizes `rfc3339` format for text formatters, and `epoch` format for JSON formatters.
@@ -215,6 +215,8 @@ This new config supports the following values:
 
   If conflict is detected in a running cluster, EMQX writes instructions on how to manually resolve it in the log as part of the error message with `critical` severity. The same error message and instructions will also be written in the `error` level log to make sure this message will not get lost even if no log handler is configured.
 
+- [#12786](https://github.com/emqx/emqx/pull/12786) Added a strict check that prevents replicant nodes from connecting to the core nodes running with a different version of EMQX application.
+Effectively it means that during the rolling upgrades the replicant nodes can only work if there is at least one core node with the matching EMQX release.
 
 ## 5.5.1
 

diff --git a/en_US/changes/changes-ee-v5.md b/en_US/changes/changes-ee-v5.md
@@ -165,7 +165,7 @@
 
 - [#12785](https://github.com/emqx/emqx/pull/12785) Added `timestamp_format` config option to log handers.
 
-This new config supports the following values:
+This new option supports the following values:
 
 - `auto`: Automatically determines the timestamp format based on the log formatter being used.
   Utilizes `rfc3339` format for text formatters, and `epoch` format for JSON formatters.
@@ -254,6 +254,9 @@ This new config supports the following values:
 
   If conflict is detected in a running cluster, EMQX writes instructions on how to manually resolve it in the log as part of the error message with `critical` severity. The same error message and instructions will also be written in the `error` level log to make sure this message will not get lost even if no log handler is configured.
 
+- [#12786](https://github.com/emqx/emqx/pull/12786) Added a strict check that prevents replicant nodes from connecting to the core nodes running with a different version of EMQX application.
+Effectively it means that during the rolling upgrades the replicant nodes can only work if there is at least one core node with the matching EMQX release.
+
 ## 5.5.1
 
 *Release Date: 2024-03-06*