Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 dc38e4b7d -> f145fa496
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/f145fa49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f145fa49 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f145fa49 Branch: refs/heads/cassandra-2.1 Commit: f145fa496ce0264708ff8525dfd45ddfb65a39f1 Parents: dc38e4b Author: Sylvain Lebresne <[email protected]> Authored: Wed Feb 26 15:15:32 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Feb 26 15:15:32 2014 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/RangeTombstoneTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f145fa49/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java index 3b0f515..15ef19a 100644 --- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java +++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java @@ -121,20 +121,20 @@ public class RangeTombstoneTest extends SchemaLoader // Inserting data String key = "k111"; - RowMutation rm; + Mutation rm; ColumnFamily cf; - rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key)); + rm = new Mutation(KSNAME, ByteBufferUtil.bytes(key)); for (int i = 0; i < 40; i += 2) add(rm, i, 0); rm.apply(); - rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key)); + rm = new Mutation(KSNAME, ByteBufferUtil.bytes(key)); cf = rm.addOrGet(CFNAME); delete(cf, 5, 10, 1); rm.apply(); - rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key)); + rm = new Mutation(KSNAME, ByteBufferUtil.bytes(key)); cf = rm.addOrGet(CFNAME); delete(cf, 15, 20, 2); rm.apply();
