You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/04/03 23:29:52 UTC
[1/3] git commit: fix test compile
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 afc4e2eb2 -> 9cd68230b
refs/heads/trunk 4bc9b47fa -> 9eb16ae5b
fix test compile
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9cd68230
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cd68230
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cd68230
Branch: refs/heads/cassandra-2.1
Commit: 9cd68230b2430a2782d2b7062eaa7ed4f3437d62
Parents: afc4e2e
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Apr 3 16:28:45 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Apr 3 16:28:45 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamTransferTaskTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cd68230/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
index 9b02817..e22fa8f 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
@@ -59,7 +59,7 @@ public class StreamTransferTaskTest extends SchemaLoader
{
List<Range<Token>> ranges = new ArrayList<>();
ranges.add(new Range<>(sstable.first.getToken(), sstable.last.getToken()));
- task.addTransferFile(sstable, 1, sstable.getPositionsForRanges(ranges));
+ task.addTransferFile(sstable, 1, sstable.getPositionsForRanges(ranges), 0);
}
assertEquals(2, task.getTotalNumberOfFiles());
[2/3] git commit: fix test compile
Posted by yu...@apache.org.
fix test compile
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9cd68230
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cd68230
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cd68230
Branch: refs/heads/trunk
Commit: 9cd68230b2430a2782d2b7062eaa7ed4f3437d62
Parents: afc4e2e
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Apr 3 16:28:45 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Apr 3 16:28:45 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamTransferTaskTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cd68230/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
index 9b02817..e22fa8f 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
@@ -59,7 +59,7 @@ public class StreamTransferTaskTest extends SchemaLoader
{
List<Range<Token>> ranges = new ArrayList<>();
ranges.add(new Range<>(sstable.first.getToken(), sstable.last.getToken()));
- task.addTransferFile(sstable, 1, sstable.getPositionsForRanges(ranges));
+ task.addTransferFile(sstable, 1, sstable.getPositionsForRanges(ranges), 0);
}
assertEquals(2, task.getTotalNumberOfFiles());
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
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/9eb16ae5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9eb16ae5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9eb16ae5
Branch: refs/heads/trunk
Commit: 9eb16ae5b37bd02914dc00643e87e3e0bc7af85e
Parents: 4bc9b47 9cd6823
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Apr 3 16:28:53 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Apr 3 16:28:53 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamTransferTaskTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------