cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [21/21] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Tue, 28 Jun 2016 08:28:16 GMT
Merge branch 'cassandra-3.9' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ff299e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ff299e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ff299e4

Branch: refs/heads/trunk
Commit: 9ff299e405cbae5eb043a4fc0dadb53fec5cfafc
Parents: 0134348 8b60fb7
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Jun 28 10:23:33 2016 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Jun 28 10:23:33 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  5 +++
 .../net/IncomingStreamingConnection.java        |  7 ++--
 .../apache/cassandra/net/MessagingService.java  | 12 +++++-
 .../cassandra/streaming/ConnectionHandler.java  | 39 +++++++++++++++-----
 .../cassandra/streaming/StreamResultFuture.java | 11 +++---
 .../streaming/StreamingTransferTest.java        | 25 ++++++++++++-
 6 files changed, 77 insertions(+), 22 deletions(-)
----------------------------------------------------------------------



Mime
View raw message