You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/02/19 12:55:07 UTC
[9/9] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
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/e8873369
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8873369
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8873369
Branch: refs/heads/trunk
Commit: e887336902ab7eccc1aa5bf09b9659a0fcf60d0d
Parents: 108260f 52d19e2
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Feb 19 11:54:39 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Feb 19 11:54:39 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/streaming/StreamTransferTask.java | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8873369/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8873369/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/StreamTransferTask.java
index 30c77e9,3add478..9f9b765
--- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
@@@ -22,8 -22,11 +22,11 @@@ import java.util.concurrent.*
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicInteger;
+ import com.google.common.base.Throwables;
+ import com.google.common.collect.Iterables;
+
import org.apache.cassandra.concurrent.NamedThreadFactory;
-import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.streaming.messages.OutgoingFileMessage;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.concurrent.Ref;