cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/6] git commit: this is why we merge forward, not backward
Date Fri, 25 Jul 2014 16:19:49 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 4f48ea001 -> f03e505fd
  refs/heads/cassandra-2.1.0 8bf6974b4 -> 557156914
  refs/heads/trunk f6a32796e -> 9b4bc73ad


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/cassandra-2.1
Commit: 557156914f32136cfcb50bf681ce2f1b26711be2
Parents: 8bf6974
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Jul 25 11:19:07 2014 -0500
Committer: Brandon Williams <brandonwilliams@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();
         }
 


Mime
View raw message