cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Date Sat, 16 Aug 2014 05:17:51 GMT
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/fe057277
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe057277
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe057277

Branch: refs/heads/trunk
Commit: fe0572778cd4449d3c3d850931f9d41a454b8994
Parents: ba22af1 8a69ef8
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Sat Aug 16 12:17:28 2014 +0700
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Sat Aug 16 12:17:28 2014 +0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  5 ++
 .../cassandra/streaming/StreamTransferTask.java | 83 ++++++++++++--------
 .../streaming/StreamTransferTaskTest.java       | 17 +++-
 3 files changed, 67 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe057277/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe057277/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
index 5d246f4,cc41a8b..16fa77b
--- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
@@@ -22,11 -24,10 +24,12 @@@ import java.util.concurrent.Future
  import java.util.concurrent.ScheduledFuture;
  import java.util.concurrent.TimeUnit;
  
 +import org.junit.BeforeClass;
  import org.junit.Test;
  
+ import junit.framework.Assert;
  import org.apache.cassandra.SchemaLoader;
 +import org.apache.cassandra.config.KSMetaData;
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.Keyspace;
  import org.apache.cassandra.dht.Range;


Mime
View raw message