You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/02/26 15:16:05 UTC
[1/2] git commit: Fix bad merge
Repository: cassandra
Updated Branches:
refs/heads/trunk 8a64f0e03 -> 78e7a5d1d
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/trunk
Commit: f145fa496ce0264708ff8525dfd45ddfb65a39f1
Parents: dc38e4b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 26 15:15:32 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
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();
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@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/78e7a5d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78e7a5d1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78e7a5d1
Branch: refs/heads/trunk
Commit: 78e7a5d1d2fc168250c78587812b300ab92f6667
Parents: 8a64f0e f145fa4
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 26 15:16:00 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 26 15:16:00 2014 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RangeTombstoneTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------