Merge pull request #8680 from emqx/dev/v4.4.7

sync dev/v4.4.7 to  main-v4.4
This commit is contained in:
Zaiming (Stone) Shi 2022-08-10 13:29:01 +01:00 committed by GitHub
commit 418db4a9d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions

View File

@ -29,11 +29,10 @@
-ifndef(EMQX_ENTERPRISE). -ifndef(EMQX_ENTERPRISE).
-define(EMQX_RELEASE, {opensource, "4.4.7"}). -define(EMQX_RELEASE, {opensource, "4.4.7-beta.1"}).
-else. -else.
-endif. -endif.
-endif. -endif.

View File

@ -1,4 +1,4 @@
#!/usr/bin/env -S escript -c #!/usr/bin/env escript
-mode(compile). -mode(compile).

View File

@ -1,6 +1,6 @@
{application, emqx, {application, emqx,
[{id, "emqx"}, [{id, "emqx"},
{description, "EMQX"}, {description, "EMQ X"},
%% Note: this version is not the same as the release version! This %% Note: this version is not the same as the release version! This
%% is simply the emqx `application' version, which is separate from %% is simply the emqx `application' version, which is separate from
%% the emqx `release' version, which in turn is comprised of several %% the emqx `release' version, which in turn is comprised of several