From 1f1580da0ddb1528cb1f9e124a389eb9308c7d8f Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 22 Nov 2024 14:05:56 +0000 Subject: [PATCH 1/2] Update osiris to v1.8.5 This release contains a bug fix to an issue that very occasionally could cause consumers on replica nodes not to be notified about newly committed offsets in a timely manner. (cherry picked from commit 675007a20b2da7ac03f2cb3f5e392f948b7d66e4) # Conflicts: # rabbitmq-components.mk --- MODULE.bazel | 2 +- rabbitmq-components.mk | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 3c297bedbc91..772e0d86d745 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -56,7 +56,7 @@ bazel_dep( bazel_dep( name = "rabbitmq_osiris", - version = "1.8.4", + version = "1.8.5", repo_name = "osiris", ) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index c89398807794..0e660103c6ed 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -121,8 +121,13 @@ dep_cuttlefish = hex 3.4.0 dep_gen_batch_server = hex 0.8.8 dep_jose = hex 1.11.10 dep_khepri = hex 0.16.0 +<<<<<<< HEAD dep_khepri_mnesia_migration = hex 0.7.0 dep_osiris = git https://github.com/rabbitmq/osiris v1.8.4 +======= +dep_khepri_mnesia_migration = hex 0.7.1 +dep_osiris = git https://github.com/rabbitmq/osiris v1.8.5 +>>>>>>> 675007a20b (Update osiris to v1.8.5) dep_prometheus = hex 4.11.0 dep_ra = hex 2.14.0 dep_ranch = hex 2.1.0 From 52297e03a0df0495af1ef5662bdada4cf9c85e3d Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 22 Nov 2024 14:54:57 -0500 Subject: [PATCH 2/2] Resolve a conflict #12785 #12789 --- rabbitmq-components.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 0e660103c6ed..502565aaa153 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -121,13 +121,8 @@ dep_cuttlefish = hex 3.4.0 dep_gen_batch_server = hex 0.8.8 dep_jose = hex 1.11.10 dep_khepri = hex 0.16.0 -<<<<<<< HEAD dep_khepri_mnesia_migration = hex 0.7.0 -dep_osiris = git https://github.com/rabbitmq/osiris v1.8.4 -======= -dep_khepri_mnesia_migration = hex 0.7.1 dep_osiris = git https://github.com/rabbitmq/osiris v1.8.5 ->>>>>>> 675007a20b (Update osiris to v1.8.5) dep_prometheus = hex 4.11.0 dep_ra = hex 2.14.0 dep_ranch = hex 2.1.0