From bee26cec124c463034b2474960adca6c654c98bf Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 26 Aug 2015 21:05:51 +0300 Subject: [PATCH] Merge seastar upstream * seastar 23f4fae...d1fa2d7 (4): > memory: provide some statistic for total memory in debug mode > core/thread: Introduce yield() > future-util: Move later() into future-util.hh > tests: make alloc_test work with many --memory sizes --- seastar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seastar b/seastar index 23f4faeea5..d1fa2d7816 160000 --- a/seastar +++ b/seastar @@ -1 +1 @@ -Subproject commit 23f4faeea516426ba69de7fef9f50b59f8904410 +Subproject commit d1fa2d7816deaa757a1bff9833f422ddd60fdf17