From ce3ec351c7f071650958568c0a8bc52ab0b1941c Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 22 May 2023 14:01:49 +0800 Subject: [PATCH 1/3] chore: remove unused conf comments --- apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf | 3 --- apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf | 3 --- 2 files changed, 6 deletions(-) diff --git a/apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf b/apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf index 011b7fb0f..e69de29bb 100644 --- a/apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf +++ b/apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf @@ -1,3 +0,0 @@ -##-------------------------------------------------------------------- -## EMQX Eviction Agent Plugin -##-------------------------------------------------------------------- diff --git a/apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf b/apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf index 8ace22435..e69de29bb 100644 --- a/apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf +++ b/apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf @@ -1,3 +0,0 @@ -##-------------------------------------------------------------------- -## EMQX Node Rebalance Plugin -##-------------------------------------------------------------------- From 5350a4a8c3aa46f0771f6968f1432f7fa95bfb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=90=E6=96=87?= Date: Mon, 22 May 2023 22:18:53 +0800 Subject: [PATCH 2/3] fix: make run failed by check acl file --- dev | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev b/dev index 18e4cbc93..485235432 100755 --- a/dev +++ b/dev @@ -321,13 +321,14 @@ boot() { ## Make erl command aware where to load all the beams ## this should be done before every erl command prepare_erl_libs "$PROFILE" + ## make sure copy acl.conf and certs to etc before render_hocon_conf + ## hocon will check rules inside acl.conf. + copy_other_conf_files render_hocon_conf generate_app_conf append_args_file - copy_other_conf_files APPS="$(apps_to_load)" - BOOT_SEQUENCE=" Apps=[${APPS}], ok=lists:foreach(fun application:load/1, Apps), From 68f4ae70b290416621e8fcf21599e4362b002d65 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Mon, 22 May 2023 22:41:19 +0200 Subject: [PATCH 3/3] chore: bump ee release version to e5.0.4-alpha.2 --- apps/emqx/include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 1b4f8a6b6..b23e59f29 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -35,7 +35,7 @@ -define(EMQX_RELEASE_CE, "5.0.25"). %% Enterprise edition --define(EMQX_RELEASE_EE, "5.0.4-alpha.1"). +-define(EMQX_RELEASE_EE, "5.0.4-alpha.2"). %% the HTTP API version -define(EMQX_API_VERSION, "5.0").