yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'v4.3.21-alpha.2' into release-v44

This commit is contained in:
JianBo He 2022-10-12 19:33:39 +08:00
parent 4f11f95c40 d2c86c5eee
commit e8eb0e11ac
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/emqx_release.hrl
View File

@ -29,7 +29,7 @@
-ifndef(EMQX_ENTERPRISE). -ifndef(EMQX_ENTERPRISE).
-define(EMQX_RELEASE, {opensource, "4.4.10-alpha.1"}). -define(EMQX_RELEASE, {opensource, "4.4.10-alpha.2"}).
-else. -else.

4
scripts/get-dashboard.sh
View File

@ -8,8 +8,8 @@ cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}" PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
case "${PKG_VSN}" in case "${PKG_VSN}" in
4.3*) 4.3*)
EMQX_CE_DASHBOARD_VERSION='v4.3.10' EMQX_CE_DASHBOARD_VERSION='v4.3.11'
EMQX_EE_DASHBOARD_VERSION='v4.3.24' EMQX_EE_DASHBOARD_VERSION='v4.3.26'
;; ;;
4.4*) 4.4*)
# keep the above 4.3 untouched, otherwise conflicts! # keep the above 4.3 untouched, otherwise conflicts!

2
src/emqx_misc.erl
View File

@ -458,7 +458,7 @@ maybe_mute_rpc_log(Node) when Node =:= node() ->
ok; ok;
maybe_mute_rpc_log(Node) -> maybe_mute_rpc_log(Node) ->
case atom_to_list(Node) of case atom_to_list(Node) of
"remsh_" ++ _ -> "remsh" ++ _ ->
%% this is either an upgrade script or nodetool %% this is either an upgrade script or nodetool
%% do nothing, the log may go to the 'emqx' command line console %% do nothing, the log may go to the 'emqx' command line console
ok; ok;