From 01a128878f03a06d7b533877df71ea2ba69da83f Mon Sep 17 00:00:00 2001
From: ieQu1 <99872536+ieQu1@users.noreply.github.com>
Date: Tue, 5 Sep 2023 11:04:12 +0200
Subject: [PATCH] chore(mria): Bump mria to 0.6.1

---
 apps/emqx/rebar.config     | 2 +-
 changes/ce/fix-11564.en.md | 2 ++
 mix.exs                    | 2 +-
 rebar.config               | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 changes/ce/fix-11564.en.md

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index eb0465db0..a404e5d81 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -28,7 +28,7 @@
     {gproc, {git, "https://github.com/emqx/gproc", {tag, "0.9.0.1"}}},
     {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}},
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}},
-    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.10"}}},
+    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.11"}}},
     {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
     {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.16"}}},
     {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.3"}}},
diff --git a/changes/ce/fix-11564.en.md b/changes/ce/fix-11564.en.md
new file mode 100644
index 000000000..cf6aa28cb
--- /dev/null
+++ b/changes/ce/fix-11564.en.md
@@ -0,0 +1,2 @@
+Fix cluster partition autoheal functionality.
+Implement autohealing for the clusters that split into multiple partitions.
diff --git a/mix.exs b/mix.exs
index 225f1753b..e3916245c 100644
--- a/mix.exs
+++ b/mix.exs
@@ -55,7 +55,7 @@ defmodule EMQXUmbrella.MixProject do
       {:cowboy, github: "emqx/cowboy", tag: "2.9.2", override: true},
       {:esockd, github: "emqx/esockd", tag: "5.9.6", override: true},
       {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.8.0-emqx-1", override: true},
-      {:ekka, github: "emqx/ekka", tag: "0.15.10", override: true},
+      {:ekka, github: "emqx/ekka", tag: "0.15.11", override: true},
       {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true},
       {:grpc, github: "emqx/grpc-erl", tag: "0.6.8", override: true},
       {:minirest, github: "emqx/minirest", tag: "1.3.11", override: true},
diff --git a/rebar.config b/rebar.config
index dae8319e0..450be64b3 100644
--- a/rebar.config
+++ b/rebar.config
@@ -62,7 +62,7 @@
     , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}}
     , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}}
     , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.8.0-emqx-1"}}}
-    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.10"}}}
+    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.11"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}
     , {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.8"}}}
     , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.11"}}}