You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/07/25 18:19:51 UTC

[3/6] git commit: this is why we merge forward, not backward

this is why we merge forward, not backward


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55715691
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55715691
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55715691

Branch: refs/heads/trunk
Commit: 557156914f32136cfcb50bf681ce2f1b26711be2
Parents: 8bf6974
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 11:19:07 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 11:19:07 2014 -0500

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/55715691/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index 6217747..2d820f3 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -150,7 +150,7 @@ public class RecoveryManagerTest extends SchemaLoader
 
             ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
             cf.addColumn(column("name-" + i, "value", ts));
-            RowMutation rm = new RowMutation("Keyspace1", dk.getKey(), cf);
+            Mutation rm = new Mutation("Keyspace1", dk.getKey(), cf);
             rm.apply();
         }