From 7f42b1d0b7295c2b62d204d14ebe38b6654ba0ac Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 1 Mar 2024 19:10:00 +0000 Subject: [PATCH 1/2] src/seastar: update seastar submodule to fix prometheus build failure Fixes: https://tracker.ceph.com/issues/64589 Signed-off-by: Samuel Just --- src/seastar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/seastar b/src/seastar index f3a1484c83b8b..1a2cd05b7bf51 160000 --- a/src/seastar +++ b/src/seastar @@ -1 +1 @@ -Subproject commit f3a1484c83b8b8ed774582f85fe33bf957390400 +Subproject commit 1a2cd05b7bf515f68841fa06ba9e3bdaecd20716 From 2806cdb15109c391c828b3419e9d141991d4003d Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 1 Mar 2024 20:00:32 +0000 Subject: [PATCH 2/2] crimson/.../interruptible_future: remove SEASTAR_CONCEPT guard Seastar commit 8dc3398a removed this macro, no longer necessary. Signed-off-by: Samuel Just --- src/crimson/common/interruptible_future.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h index 5f8323a66d14f..a44c99a1867b9 100644 --- a/src/crimson/common/interruptible_future.h +++ b/src/crimson/common/interruptible_future.h @@ -69,7 +69,6 @@ namespace seastar::internal { {}; } -SEASTAR_CONCEPT( namespace crimson::interruptible { template class interruptible_future_detail; @@ -79,7 +78,6 @@ namespace seastar::impl { struct is_tuple_of_futures, Rest...>> : is_tuple_of_futures> {}; } -) namespace crimson::interruptible {