You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/09/28 04:04:44 UTC
[1/3] git commit: fix typo in test
Updated Branches:
refs/heads/trunk fe54388ba -> bb8e95c2b
fix typo in test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d3d67e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d3d67e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d3d67e5
Branch: refs/heads/trunk
Commit: 8d3d67e5f2ce2a215dc9f72ca252e5f0efdadc6e
Parents: bdb269a
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 27 22:03:15 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 27 22:03:15 2013 -0400
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d3d67e5/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
index 67e3623..8166ffd 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
@@ -109,10 +109,10 @@ public class RangeTombstoneListTest
assert !iter.hasNext();
RangeTombstoneList l2 = new RangeTombstoneList(cmp, initialCapacity);
- l.add(rt(4, 10, 12L));
- l.add(rt(0, 8, 25L));
+ l2.add(rt(4, 10, 12L));
+ l2.add(rt(0, 8, 25L));
- assertEquals(25L, l.search(b(8)).markedForDeleteAt);
+ assertEquals(25L, l2.search(b(8)).markedForDeleteAt);
}
@Test
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb8e95c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb8e95c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb8e95c2
Branch: refs/heads/trunk
Commit: bb8e95c2b93ce4f60288272b51d5829634905674
Parents: fe54388 ed7b08b
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 27 22:04:15 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 27 22:04:15 2013 -0400
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed7b08b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed7b08b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed7b08b3
Branch: refs/heads/trunk
Commit: ed7b08b399df8cad311a28a25a47c576238d3f0a
Parents: 3a70933 8d3d67e
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 27 22:03:47 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 27 22:03:47 2013 -0400
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------