Merge pull request #8782 from zhongwencool/sync-v4.3-to-v4.4

chore: sync v4.3 to v4.4
2022-08-23 21:44:14 +08:00 · 2022-08-23 21:44:14 +08:00 · 73403b65e9
parent f8516ed887 8d389d9619
commit 73403b65e9
2 changed files with 3 additions and 2 deletions
--- a/include/emqx_release.hrl
+++ b/include/emqx_release.hrl
@ -29,7 +29,7 @@

 -ifndef(EMQX_ENTERPRISE).

-define(EMQX_RELEASE, {opensource, "4.4.8-beta.2"}).
+-define(EMQX_RELEASE, {opensource, "4.4.8-beta.3"}).

 -else.

--- a/src/emqx_plugins.erl
+++ b/src/emqx_plugins.erl
@ -250,7 +250,8 @@ default_plugins() ->
        %% default is true in data/load_modules. **NOT HERE**
        {emqx_retainer, false},
        {emqx_recon, true},
-        {emqx_telemetry, true},
+        %% emqx_telemetry is not exist in enterprise.
+        %% {emqx_telemetry, false},
        {emqx_rule_engine, true},
        {emqx_bridge_mqtt, false}
    ].