You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2018/09/17 11:06:43 UTC
[1/3] cassandra git commit: ninja fix: bad merge in LegacyLayoutTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 5d5588204 -> 287a960af
refs/heads/trunk 261e75f19 -> 7a34477a9
ninja fix: bad merge in LegacyLayoutTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/287a960a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/287a960a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/287a960a
Branch: refs/heads/cassandra-3.11
Commit: 287a960afb10332b3521399d8ae35f892b58c995
Parents: 5d55882
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Mon Sep 17 11:58:27 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Mon Sep 17 11:58:27 2018 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/LegacyLayoutTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/287a960a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
index ae52902..2395963 100644
--- a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
+++ b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
@@ -276,8 +276,8 @@ public class LegacyLayoutTest
Row.Builder builder;
builder = BTreeRow.unsortedBuilder(0);
- builder.newRow(new Clustering(UTF8Serializer.instance.serialize("a")));
- builder.addCell(BufferCell.live(table, v, 0L, Int32Serializer.instance.serialize(1), null));
+ builder.newRow(new BufferClustering(UTF8Serializer.instance.serialize("a")));
+ builder.addCell(BufferCell.live(v, 0L, Int32Serializer.instance.serialize(1), null));
builder.addComplexDeletion(bug, new DeletionTime(1L, 1));
Row row = builder.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: ninja fix: bad merge in LegacyLayoutTest
Posted by be...@apache.org.
ninja fix: bad merge in LegacyLayoutTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/287a960a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/287a960a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/287a960a
Branch: refs/heads/trunk
Commit: 287a960afb10332b3521399d8ae35f892b58c995
Parents: 5d55882
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Mon Sep 17 11:58:27 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Mon Sep 17 11:58:27 2018 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/LegacyLayoutTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/287a960a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
index ae52902..2395963 100644
--- a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
+++ b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
@@ -276,8 +276,8 @@ public class LegacyLayoutTest
Row.Builder builder;
builder = BTreeRow.unsortedBuilder(0);
- builder.newRow(new Clustering(UTF8Serializer.instance.serialize("a")));
- builder.addCell(BufferCell.live(table, v, 0L, Int32Serializer.instance.serialize(1), null));
+ builder.newRow(new BufferClustering(UTF8Serializer.instance.serialize("a")));
+ builder.addCell(BufferCell.live(v, 0L, Int32Serializer.instance.serialize(1), null));
builder.addComplexDeletion(bug, new DeletionTime(1L, 1));
Row row = builder.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a34477a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a34477a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a34477a
Branch: refs/heads/trunk
Commit: 7a34477a916ded2250368cbf995a38ed0242c6cf
Parents: 261e75f 287a960
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Mon Sep 17 11:58:50 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Mon Sep 17 11:58:50 2018 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org