From 3df4c8c57ee0428a7bc6d4ed71bf40c134638dd0 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Mon, 25 Jul 2022 10:09:28 +0800
Subject: [PATCH 1/3] chore: conf check cli notes include conf result

---
 bin/emqx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/emqx b/bin/emqx
index 503e7059e..ec5de13b8 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -836,7 +836,12 @@ case "$1" in
         ;;
     check_conf)
         generate_config "check_only"
-        echo "$RUNNER_ETC_DIR/emqx.conf is ok"
+        INCLUDE_CONFS=$(< "$RUNNER_ETC_DIR/emqx.conf" grep "include" |awk '{print $2}'|xargs)
+        if [ "$INCLUDE_CONFS" == "" ]; then
+          echo "$RUNNER_ETC_DIR/emqx.conf is ok"
+        else
+          echo "$RUNNER_ETC_DIR/emqx.conf(include $INCLUDE_CONFS) is ok"
+        fi
         ;;
 
     ctl)

From 91a7022e8331fead4108c81a114adf18e9f08e93 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Fri, 22 Jul 2022 15:46:12 +0800
Subject: [PATCH 2/3] fix: duplicate rule when query by page

---
 apps/emqx_management/src/emqx_mgmt_api.erl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/emqx_management/src/emqx_mgmt_api.erl b/apps/emqx_management/src/emqx_mgmt_api.erl
index c29f6bfdf..66a5c1f9d 100644
--- a/apps/emqx_management/src/emqx_mgmt_api.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api.erl
@@ -98,11 +98,12 @@ node_query(Node, Params, {Tab, QsSchema}, QueryFun, SortFun) ->
                 true -> Meta#{count => count(Tab), hasnext => length(Rows) > Limit};
                 _ -> Meta#{count => -1, hasnext => length(Rows) > Limit}
             end,
-    NRows = case SortFun of
-                undefined -> Rows;
-                _ -> lists:sort(SortFun, Rows)
-            end,
-    #{meta => NMeta, data => lists:sublist(NRows, Limit)}.
+    Data0 = lists:sublist(Rows, Limit),
+    Data = case SortFun of
+               undefined -> Data0;
+               _ -> lists:sort(SortFun, Data0)
+           end,
+    #{meta => NMeta, data => Data}.
 
 %% @private
 do_query(Node, Qs, {M,F}, Start, Limit) when Node =:= node() ->

From 26cae49e4a593c8bb1a1ff98d6a4f24e6f87fc46 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Tue, 26 Jul 2022 17:00:46 +0800
Subject: [PATCH 3/3] chore: bump to v4.3.17.beta.4

---
 include/emqx_release.hrl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl
index 823203939..597714383 100644
--- a/include/emqx_release.hrl
+++ b/include/emqx_release.hrl
@@ -29,7 +29,7 @@
 
 -ifndef(EMQX_ENTERPRISE).
 
--define(EMQX_RELEASE, {opensource, "4.3.17-beta.3"}).
+-define(EMQX_RELEASE, {opensource, "4.3.17-beta.4"}).
 
 -else.