Merge pull request ceph#55878 from athanatos/sjust/wip-seastar-module

athanatos · web-flow · commit 3c0710024e0e · 2024-03-01T18:43:02.000-08:00
crimson: update seastar submodule to fix prometheus build error

Reviewed-by: Radoslaw Zarzynski &lt;rzarzyns@redhat.com&gt;
diff --git 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<typename InterruptCond, typename FutureType>
   class interruptible_future_detail;
@@ -79,7 +78,6 @@ namespace seastar::impl {
   struct is_tuple_of_futures<std::tuple<crimson::interruptible::interruptible_future_detail<InterruptCond, FutureType>, Rest...>>
     : is_tuple_of_futures<std::tuple<Rest...>> {};
 }
-)
 
 namespace crimson::interruptible {
 
diff --git a/src/seastar b/src/seastar
@@ -1 +1 @@
-Subproject commit f3a1484c83b8b8ed774582f85fe33bf957390400
+Subproject commit 1a2cd05b7bf515f68841fa06ba9e3bdaecd20716

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ namespace seastar::internal {`
`69`	`69`	`{};`
`70`	`70`	`}`
`71`	`71`
`72`		`-SEASTAR_CONCEPT(`
`73`	`72`	`namespace crimson::interruptible {`
`74`	`73`	`template<typename InterruptCond, typename FutureType>`
`75`	`74`	`class interruptible_future_detail;`
`@@ -79,7 +78,6 @@ namespace seastar::impl {`
`79`	`78`	`struct is_tuple_of_futures<std::tuple<crimson::interruptible::interruptible_future_detail<InterruptCond, FutureType>, Rest...>>`
`80`	`79`	`: is_tuple_of_futures<std::tuple<Rest...>> {};`
`81`	`80`	`}`
`82`		`-)`
`83`	`81`
`84`	`82`	`namespace crimson::interruptible {`
`85`	`83`