Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1334f94e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1334f94e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1334f94e Branch: refs/heads/cassandra-2.0 Commit: 1334f94e40ce5dbed7270808abb2330ea6d37c51 Parents: b2da839 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Dec 3 14:56:19 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Dec 3 14:56:19 2013 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/marshal/CollectionType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1334f94e/src/java/org/apache/cassandra/db/marshal/CollectionType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/CollectionType.java b/src/java/org/apache/cassandra/db/marshal/CollectionType.java index 9408980..07c86e0 100644 --- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java +++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java @@ -113,7 +113,7 @@ public abstract class CollectionType<T> extends AbstractType<T> return (ByteBuffer)result.flip(); } - protected List<Pair<ByteBuffer, IColumn>> enforceLimit(List<Pair<ByteBuffer, IColumn>> columns) + protected List<Pair<ByteBuffer, Column>> enforceLimit(List<Pair<ByteBuffer, Column>> columns) { if (columns.size() <= MAX_ELEMENTS) return columns;
