Merge tag 'v4.3.21-alpha.2' into release-v44
This commit is contained in:
commit
e8eb0e11ac
|
@ -29,7 +29,7 @@
|
|||
|
||||
-ifndef(EMQX_ENTERPRISE).
|
||||
|
||||
-define(EMQX_RELEASE, {opensource, "4.4.10-alpha.1"}).
|
||||
-define(EMQX_RELEASE, {opensource, "4.4.10-alpha.2"}).
|
||||
|
||||
-else.
|
||||
|
||||
|
|
|
@ -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'
|
||||
;;
|
||||
4.4*)
|
||||
# keep the above 4.3 untouched, otherwise conflicts!
|
||||
|
|
|
@ -458,7 +458,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;
|
||||
|
|
Loading…
Reference in New Issue