Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bc9b47f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bc9b47f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bc9b47f Branch: refs/heads/trunk Commit: 4bc9b47fab02067b28711ac790a095d30f540245 Parents: 345772d afc4e2e Author: Yuki Morishita <[email protected]> Authored: Thu Apr 3 16:19:51 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Apr 3 16:19:51 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/StreamSession.java | 8 +- .../apache/cassandra/streaming/StreamTask.java | 6 ++ .../cassandra/streaming/StreamTransferTask.java | 61 +++++++++++++-- .../cassandra/streaming/StreamWriter.java | 3 - .../compress/CompressedStreamWriter.java | 2 - .../streaming/StreamTransferTaskTest.java | 80 ++++++++++++++++++++ 7 files changed, 149 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bc9b47f/CHANGES.txt ----------------------------------------------------------------------
