From 305918ec9e1d08a088f51ad2564201e3d3f3b936 Mon Sep 17 00:00:00 2001 From: zhouzb Date: Wed, 23 Dec 2020 10:33:04 +0800 Subject: [PATCH 1/3] fix(hot upgrade): fix bad hot upgrade script --- src/emqx.appup.src | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emqx.appup.src b/src/emqx.appup.src index 26c90e850..8214b2e7f 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -8,7 +8,6 @@ end, {VSN, [ - {<<".*">>, []}, {"4.2.2", [ {load_module, emqx_metrics, brutal_purge, soft_purge, []} ]}, @@ -27,10 +26,10 @@ [emqx, force_shutdown_policy, #{message_queue_len => DefaultLen, max_heap_size => DefaultSize div WordSize}]}} - ]} + ]}, + {<<".*">>, []} ], [ - {<<".*">>, []}, {"4.2.2", [ {load_module, emqx_metrics, brutal_purge, soft_purge, []} ]}, @@ -45,6 +44,7 @@ {load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_mod_topic_metrics, brutal_purge, soft_purge, []}, {load_module, emqx_json, brutal_purge, soft_purge, []} - ]} + ]}, + {<<".*">>, []} ] }. From b439d513378ac2593e8c2fe6830d7607f3200adb Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 14 Jan 2021 17:09:04 +0100 Subject: [PATCH 2/3] fix(ekka): Upgrade to 0.7.6 to allow remsh Before ekka 0.7.6, when epmd is not used, ekka_dist would calculate a port number from node name. This does not work for remote consoles because a remsh node name is like remsh81random0- i.e. the calculated port number is always the same as the target node. The fix in 0.7.6 allows remsh prefixed nodes to use a range of ports to listen. --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index 23d0eb290..9f2a3ae87 100644 --- a/rebar.config +++ b/rebar.config @@ -7,7 +7,7 @@ {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.7.1"}}}, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.7.4"}}}, - {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.7.5"}}}, + {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.7.6"}}}, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.0"}}}, {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.0.0"}}} ]}. From af73516c59671ee5ed9d7f4f423f9381175a357a Mon Sep 17 00:00:00 2001 From: CrazyWisdom Date: Thu, 28 Jan 2021 16:48:52 +0800 Subject: [PATCH 3/3] docs(README.md): update Community section --- README.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index deaa178a9..e94243a41 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ [![Coverage Status](https://coveralls.io/repos/github/emqx/emqx/badge.svg?branch=master)](https://coveralls.io/github/emqx/emqx?branch=master) [![Docker Pulls](https://img.shields.io/docker/pulls/emqx/emqx)](https://hub.docker.com/r/emqx/emqx) [![Slack Invite]()](https://slack-invite.emqx.io) -[![Twitter](https://img.shields.io/badge/Twitter-EMQ%20X-1DA1F2?logo=twitter)](https://twitter.com/emqtt) +[![Twitter](https://img.shields.io/badge/Follow-EMQ%20X-1DA1F2?logo=twitter)](https://twitter.com/emqtt) +[![Community](https://img.shields.io/badge/Community-EMQ%20X-yellow?logo=github)](https://github.com/emqx/emqx/discussions) [![The best IoT MQTT open source team looks forward to your joining](https://www.emqx.io/static/img/github_readme_en_bg.png)](https://www.emqx.io/careers) @@ -72,17 +73,11 @@ Visiting [EMQ X FAQ](https://docs.emqx.io/broker/latest/en/faq/faq.html) to get The [EMQ X Roadmap uses Github milestones](https://github.com/emqx/emqx/milestones) to track the progress of the project. -## Community, discussion, contribution, and support +## Community -You can reach the EMQ community and developers via the following channels: -- [Slack](https://slack-invite.emqx.io/) -- [Twitter](https://twitter.com/emqtt) -- [Facebook](https://www.facebook.com/emqxmqtt) -- [Reddit](https://www.reddit.com/r/emqx/) -- [Forum](https://groups.google.com/d/forum/emqtt) -- [Blog](https://medium.com/@emqtt) +The EMQ X community can be found on [GitHub Discussions](https://github.com/emqx/emqx/discussions), where you can ask questions, voice ideas, and share your projects. -Please submit any bugs, issues, and feature requests to [emqx/emqx](https://github.com/emqx/emqx/issues). +To chat with other community members you can join the [EMQ X Slack](https://slack-invite.emqx.io). ## MQTT Specifications