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

Merge branch 'release-50' into 0522-merge-release-50-to-master

This commit is contained in:
某文 2023-05-23 07:56:35 +08:00
parent 732a7be187 26e31137c7
commit ed1268ed30
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/include/emqx_release.hrl
View File

@ -35,7 +35,7 @@
-define(EMQX_RELEASE_CE, "5.0.25"). -define(EMQX_RELEASE_CE, "5.0.25").
%% Enterprise edition %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.0.4-alpha.1"). -define(EMQX_RELEASE_EE, "5.0.4-alpha.2").
%% the HTTP API version %% the HTTP API version
-define(EMQX_API_VERSION, "5.0"). -define(EMQX_API_VERSION, "5.0").

3
apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf
View File

@ -1,3 +0,0 @@
##--------------------------------------------------------------------
## EMQX Eviction Agent Plugin
##--------------------------------------------------------------------

3
apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf
View File

@ -1,3 +0,0 @@
##--------------------------------------------------------------------
## EMQX Node Rebalance Plugin
##--------------------------------------------------------------------

4
dev
View File

@ -323,10 +323,12 @@ boot() {
## Make erl command aware where to load all the beams ## Make erl command aware where to load all the beams
## this should be done before every erl command ## this should be done before every erl command
prepare_erl_libs "$PROFILE" 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 render_hocon_conf
generate_app_conf generate_app_conf
append_args_file append_args_file
copy_other_conf_files
APPS="$(apps_to_load)" APPS="$(apps_to_load)"
BOOT_SEQUENCE=" BOOT_SEQUENCE="