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 <[email protected]> Authored: Mon Sep 17 11:58:27 2018 +0100 Committer: Benedict Elliott Smith <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
