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/03/18 16:58:57 UTC
cassandra git commit: ninja fix bad merge
Repository: cassandra
Updated Branches:
refs/heads/trunk 07cad8e8d -> f36fe9fb1
ninja fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f36fe9fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f36fe9fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f36fe9fb
Branch: refs/heads/trunk
Commit: f36fe9fb18b37656dbffd4f136edb31dc3abc45e
Parents: 07cad8e
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Mar 18 15:58:44 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Mar 18 15:58:44 2015 +0000
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableScannerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f36fe9fb/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
index 22eb5a0..0538a11 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
@@ -114,7 +114,7 @@ public class SSTableScannerTest
private static Token token(int key)
{
- return key == Integer.MIN_VALUE ? ByteOrderedPartitioner.MINIMUM : new BytesToken(toKey(key).getBytes());
+ return key == Integer.MIN_VALUE ? ByteOrderedPartitioner.MINIMUM : new ByteOrderedPartitioner.BytesToken(toKey(key).getBytes());
}
private static RowPosition min(int key)
@@ -134,8 +134,8 @@ public class SSTableScannerTest
private static Range<Token> rangeFor(int start, int end)
{
- return new Range<Token>(new BytesToken(toKey(start).getBytes()),
- end == Integer.MIN_VALUE ? ByteOrderedPartitioner.MINIMUM : new BytesToken(toKey(end).getBytes()));
+ return new Range<Token>(new ByteOrderedPartitioner.BytesToken(toKey(start).getBytes()),
+ end == Integer.MIN_VALUE ? ByteOrderedPartitioner.MINIMUM : new ByteOrderedPartitioner.BytesToken(toKey(end).getBytes()));
}
private static Collection<Range<Token>> makeRanges(int ... keys)