From 7fe6bc6094b6efec18eba56817aa6c7db3f177b0 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Wed, 12 Oct 2022 11:28:44 +0800 Subject: [PATCH 1/3] chore: update dashboard vsn --- scripts/get-dashboard.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/get-dashboard.sh b/scripts/get-dashboard.sh index f9a85a108..5a0ca5da0 100755 --- a/scripts/get-dashboard.sh +++ b/scripts/get-dashboard.sh @@ -8,8 +8,8 @@ cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.." PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}" case "${PKG_VSN}" in 4.3*) - EMQX_CE_DASHBOARD_VERSION='v4.3.10' - EMQX_EE_DASHBOARD_VERSION='v4.3.24' + EMQX_CE_DASHBOARD_VERSION='v4.3.11' + EMQX_EE_DASHBOARD_VERSION='v4.3.26' ;; *) echo "Unsupported version $PKG_VSN" >&2 From e57ab9a8c153bcb597038f6c13a0d2334f4a5a56 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 12 Oct 2022 12:42:37 +0200 Subject: [PATCH 2/3] fix: remsh prefix may not include an underscore --- src/emqx_misc.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqx_misc.erl b/src/emqx_misc.erl index 021596957..58f7e9ae4 100644 --- a/src/emqx_misc.erl +++ b/src/emqx_misc.erl @@ -456,7 +456,7 @@ maybe_mute_rpc_log(Node) when Node =:= node() -> ok; maybe_mute_rpc_log(Node) -> case atom_to_list(Node) of - "remsh_" ++ _ -> + "remsh" ++ _ -> %% this is either an upgrade script or nodetool %% do nothing, the log may go to the 'emqx' command line console ok; From d2c86c5eee9ffd5142ee499b1743efc378f83528 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Wed, 12 Oct 2022 19:16:17 +0800 Subject: [PATCH 3/3] chore: bump vsn --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index f4be73a77..36d1fa5d3 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.3.21-alpha.1"}). +-define(EMQX_RELEASE, {opensource, "4.3.21-alpha.2"}). -else.