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/9fd60777 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fd60777 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fd60777 Branch: refs/heads/trunk Commit: 9fd607778091c48910db557d7a95029cac077244 Parents: b4133f3 59ee46e Author: Yuki Morishita <[email protected]> Authored: Wed Jul 6 12:34:30 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed Jul 6 12:34:30 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/ConnectionHandler.java | 8 ++-- .../cassandra/streaming/StreamReceiveTask.java | 50 +++++++++++++++----- .../cassandra/streaming/StreamSession.java | 17 +++++-- .../streaming/StreamingTransferTest.java | 30 ++++++++++-- 5 files changed, 83 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fd60777/CHANGES.txt ----------------------------------------------------------------------
