From 6a9ed4a4ebe4d4acdb3edb297bb9a19b9aefbd96 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Thu, 12 Nov 2015 11:19:52 +0200
Subject: [PATCH] Merge seastar upstream

* seastar 5c10d3e...20bf03b (5):
  > do not re-throw exception to get to an exception pointer
  > Adding timeout counter to the rpc
  > configure.py: support for pkg-config before release 0.28
  > future: don't forget to warn about ignored exception
  > tutorial: continue network API section
---
 seastar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seastar b/seastar
index 5c10d3e7ae..20bf03b930 160000
--- a/seastar
+++ b/seastar
@@ -1 +1 @@
-Subproject commit 5c10d3e7ae68f6254a0e63846a2910b88b076b0e
+Subproject commit 20bf03b930c3900bb897c24419451bdca476b3ce