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:49 UTC
[1/6] git commit: this is why we merge forward, not backward
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 <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();
}
[3/6] git commit: this is why we merge forward, not backward
Posted by br...@apache.org.
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();
}
[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f03e505f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f03e505f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f03e505f
Branch: refs/heads/cassandra-2.1
Commit: f03e505fdc439b5c52c2c4c000ae6e9f26e706a9
Parents: 4f48ea0 5571569
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 11:19:16 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 11:19:16 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/9b4bc73a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b4bc73a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b4bc73a
Branch: refs/heads/trunk
Commit: 9b4bc73ad688d96ef9730a7b5fa9421426d8ffd2
Parents: f6a3279 f03e505
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 11:19:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 11:19:29 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: this is why we merge forward, not backward
Posted by br...@apache.org.
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.0
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();
}
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f03e505f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f03e505f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f03e505f
Branch: refs/heads/trunk
Commit: f03e505fdc439b5c52c2c4c000ae6e9f26e706a9
Parents: 4f48ea0 5571569
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 11:19:16 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 11:19:16 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------