From 7451351c42111ec2f9e6bb6032553b58726d2b29 Mon Sep 17 00:00:00 2001 From: William Yang Date: Mon, 29 Aug 2022 14:46:47 +0200 Subject: [PATCH 1/5] fix: quic listener idle_timeout type err --- CHANGES-5.0.md | 1 + apps/emqx/src/emqx_schema.erl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES-5.0.md b/CHANGES-5.0.md index 66529953a..210a5c5ad 100644 --- a/CHANGES-5.0.md +++ b/CHANGES-5.0.md @@ -5,6 +5,7 @@ * Remove the needless `will_msg` field from the client API. [#8721](https://github.com/emqx/emqx/pull/8721) * Fix `$queue` topic name error in management API return. [#8728](https://github.com/emqx/emqx/pull/8728) * Fix sometimes `client.connected` and `client.disconnected` could be in wrong order. [#8625](https://github.com/emqx/emqx/pull/8625) +* Fix quic listener default idle timeout's type. [#8826](https://github.com/emqx/emqx/pull/8826) ## Enhancements diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl index 75818ab2b..b2c7723d0 100644 --- a/apps/emqx/src/emqx_schema.erl +++ b/apps/emqx/src/emqx_schema.erl @@ -869,7 +869,7 @@ fields("mqtt_quic_listener") -> sc( duration_ms(), #{ - default => "0", + default => 0, desc => ?DESC(fields_mqtt_quic_listener_idle_timeout) } )}, From dceb93dc2ae850c4c52d3e85419054cf16b8255c Mon Sep 17 00:00:00 2001 From: zhouzb Date: Tue, 30 Aug 2022 09:33:52 +0800 Subject: [PATCH 2/5] chore: bump helm chart version to 5.0.7 --- deploy/charts/emqx/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index e18bac2b8..544d848fd 100644 --- a/deploy/charts/emqx/Chart.yaml +++ b/deploy/charts/emqx/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 5 +version: 5.0.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: latest +appVersion: 5.0.7 From 80bdc2b8e8b4cd37453747ac294381e23edc8fb4 Mon Sep 17 00:00:00 2001 From: zhouzb Date: Tue, 30 Aug 2022 15:42:08 +0800 Subject: [PATCH 3/5] docs(changes): add changes for bootstrap users --- CHANGES-5.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES-5.0.md b/CHANGES-5.0.md index 3bd74e00b..5eca6a9a3 100644 --- a/CHANGES-5.0.md +++ b/CHANGES-5.0.md @@ -27,6 +27,7 @@ ## Enhancements +* Add `bootstrap_users_file` configuration to add default Dashboard username list, which is only added when EMQX is first started. * The license is now copied to all nodes in the cluster when it's reloaded. [#8598](https://github.com/emqx/emqx/pull/8598) * Added a HTTP API to manage licenses. [#8610](https://github.com/emqx/emqx/pull/8610) * Updated `/nodes` API node_status from `Running/Stopped` to `running/stopped`. [#8642](https://github.com/emqx/emqx/pull/8642) From ee91128cef5c9f7f258d2c061df8fb334ae8548d Mon Sep 17 00:00:00 2001 From: zhouzb Date: Thu, 1 Sep 2022 15:05:18 +0800 Subject: [PATCH 4/5] chore: bump vsn --- apps/emqx/include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index eb8b08c03..bc14ef209 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,7 +32,7 @@ %% `apps/emqx/src/bpapi/README.md' %% Community edition --define(EMQX_RELEASE_CE, "5.0.6"). +-define(EMQX_RELEASE_CE, "5.0.7"). %% Enterprise edition -define(EMQX_RELEASE_EE, "5.0.0-alpha.1"). From 512e1571adee523f82e53e1ac2abb886de86b4b8 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Fri, 26 Aug 2022 15:04:23 +0800 Subject: [PATCH 5/5] chore: update dashboard vsn --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 89f91ee4a..be56da973 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-17:1.13.4-24.2.1-1-d export EMQX_DEFAULT_RUNNER = debian:11-slim export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh) export ELIXIR_VSN ?= $(shell $(CURDIR)/scripts/get-elixir-vsn.sh) -export EMQX_DASHBOARD_VERSION ?= v1.0.7 +export EMQX_DASHBOARD_VERSION ?= v1.0.8 export EMQX_EE_DASHBOARD_VERSION ?= e1.0.0 export EMQX_REL_FORM ?= tgz export QUICER_DOWNLOAD_FROM_RELEASE = 1