Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1632B172A2 for ; Wed, 18 Mar 2015 15:58:58 +0000 (UTC) Received: (qmail 39400 invoked by uid 500); 18 Mar 2015 15:58:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 39366 invoked by uid 500); 18 Mar 2015 15:58:57 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 39355 invoked by uid 99); 18 Mar 2015 15:58:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Mar 2015 15:58:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4D49E1849; Wed, 18 Mar 2015 15:58:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Message-Id: <1d41a5ae0f1946a78a34e958d81c7a26@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: ninja fix bad merge Date: Wed, 18 Mar 2015 15:58:57 +0000 (UTC) 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 Authored: Wed Mar 18 15:58:44 2015 +0000 Committer: Benedict Elliott Smith 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 rangeFor(int start, int end) { - return new Range(new BytesToken(toKey(start).getBytes()), - end == Integer.MIN_VALUE ? ByteOrderedPartitioner.MINIMUM : new BytesToken(toKey(end).getBytes())); + return new Range(new ByteOrderedPartitioner.BytesToken(toKey(start).getBytes()), + end == Integer.MIN_VALUE ? ByteOrderedPartitioner.MINIMUM : new ByteOrderedPartitioner.BytesToken(toKey(end).getBytes())); } private static Collection> makeRanges(int ... keys)