Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/afc4e2eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afc4e2eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afc4e2eb Branch: refs/heads/cassandra-2.1 Commit: afc4e2eb20e9918595356173af0cfc32bba142bf Parents: 3a51a7e 04fd84c Author: Yuki Morishita <yu...@apache.org> Authored: Thu Apr 3 16:19:42 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Apr 3 16:19:42 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/afc4e2eb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/afc4e2eb/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/streaming/StreamSession.java index f766bb6,449751d..d258db5 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@@ -21,8 -21,11 +21,10 @@@ import java.io.IOException import java.net.InetAddress; import java.util.*; import java.util.concurrent.Future; + import java.util.concurrent.TimeUnit; + import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import org.apache.cassandra.io.sstable.SSTableWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/afc4e2eb/src/java/org/apache/cassandra/streaming/StreamTransferTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/afc4e2eb/src/java/org/apache/cassandra/streaming/StreamWriter.java ----------------------------------------------------------------------
