From 49449fc30cbd37699d784d10a8dae5eef13b77fb Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Mon, 13 Jun 2016 19:35:00 +0300
Subject: [PATCH] Merge seastar upstream

* seastar 864d6dc...401c333 (8):
  > scollectd: Support filtering specific collectd metrics
  > core: Integrate error reporting with the logging framework
  > rpc: wait for all replies to be completed before closing rpc server
  > rpc: clean up resource accounting
  > queue: fix race between pop_eventually() and abort()
  > rpc_test: fix cancel test to not depend on timing.
  > tutorial: explain application-specific command line options
  > add ostream output operator for std::unordered_map
---
 seastar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seastar b/seastar
index 864d6dcef9..401c333b11 160000
--- a/seastar
+++ b/seastar
@@ -1 +1 @@
-Subproject commit 864d6dcef9dfe0648aa0ab85801fb8caac8b6790
+Subproject commit 401c333b118059c156700caf7dc8ae903532fee3