Просмотр исходного кода

Merge pull request #11084 from zhongwencool/hide-plugins-from-cli

chore: hide plugins from conf load cli
zhongwencool 2 лет назад
Родитель
Сommit
1f1d61cef6
3 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      Makefile
  2. 1 1
      apps/emqx/include/emqx_release.hrl
  3. 1 1
      apps/emqx_conf/src/emqx_conf_cli.erl

+ 2 - 2
Makefile

@@ -15,8 +15,8 @@ endif
 
 # Dashboard version
 # from https://github.com/emqx/emqx-dashboard5
-export EMQX_DASHBOARD_VERSION ?= v1.3.0
-export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0-beta.7
+export EMQX_DASHBOARD_VERSION ?= v1.3.0-1
+export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0-beta.9
 
 # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used
 # In make 4.4+, for backward-compatibility the value from the original environment is used.

+ 1 - 1
apps/emqx/include/emqx_release.hrl

@@ -35,7 +35,7 @@
 -define(EMQX_RELEASE_CE, "5.1.0-alpha.5").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.1.0-alpha.7").
+-define(EMQX_RELEASE_EE, "5.1.0-alpha.8").
 
 %% The HTTP API version
 -define(EMQX_API_VERSION, "5.0").

+ 1 - 1
apps/emqx_conf/src/emqx_conf_cli.erl

@@ -170,7 +170,7 @@ drop_hidden_roots(Conf) ->
     lists:foldl(fun(K, Acc) -> maps:remove(K, Acc) end, Conf, hidden_roots()).
 
 hidden_roots() ->
-    [<<"trace">>, <<"stats">>, <<"broker">>, <<"persistent_session_store">>].
+    [<<"trace">>, <<"stats">>, <<"broker">>, <<"persistent_session_store">>, <<"plugins">>].
 
 get_config(Key) ->
     case emqx:get_raw_config([Key], undefined) of