Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/082bfc9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/082bfc9e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/082bfc9e Branch: refs/heads/trunk Commit: 082bfc9ee6dc6db5314b0262430d3c8b8435a3a3 Parents: 86382f6 c0c2de5 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Apr 25 12:28:04 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Apr 25 12:28:04 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/082bfc9e/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/ColumnIdentifier.java index 330eec0,b4cb9e0..a8a25cf --- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java +++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java @@@ -27,7 -26,9 +27,7 @@@ import org.apache.cassandra.utils.ByteB /** * Represents an identifer for a CQL column definition. */ - public class ColumnIdentifier implements Selectable, Comparable<ColumnIdentifier> -public class ColumnIdentifier implements RawSelector ++public class ColumnIdentifier implements Selectable { public final ByteBuffer key; private final String text;