Permalink
Browse files

Merge seastar upstream

* seastar c2e86d5...78e3924 (2):
  > fix output stream batching
  > rpc: server connection shutdown fix

Adjust transport/server.cc for the demise of output_stream::batch_flush()
  • Loading branch information...
1 parent b8c8473 commit 0498cebc58b9fbadb25a7b018cebf95d965d88da @avikivity avikivity committed Oct 12, 2015
Showing with 2 additions and 2 deletions.
  1. +1 −1 seastar
  2. +1 −1 transport/server.cc
Submodule seastar updated from c2e86d to 78e392
View
@@ -809,7 +809,7 @@ future<> cql_server::connection::write_response(shared_ptr<cql_server::response>
{
_ready_to_respond = _ready_to_respond.then([this, response = std::move(response)] () mutable {
return response->output(_write_buf, _version).then([this, response] {
- return _write_buf.batch_flush();
+ return _write_buf.flush();
});
});
return make_ready_future<>();

0 comments on commit 0498ceb

Please sign in to comment.