Sylvain Lebresne 4c727f6f97 Merge branch 'cassandra-2.0' into trunk ... Conflicts: src/java/org/apache/cassandra/cql3/CFDefinition.java src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java src/java/org/apache/cassandra/cql3/Cql.g src/java/org/apache/cassandra/cql3/statements/SelectStatement.java src/java/org/apache/cassandra/db/marshal/CompositeType.java		2014-02-17 15:02:44 +01:00
..
cql	cqlsh: tab-complete key alias for ALTER CF ALTER	2012-02-24 11:20:14 +01:00
cql3	Merge branch 'cassandra-2.0' into trunk	2014-02-17 15:02:44 +01:00
native_protocol_v1.spec	Merge branch 'cassandra-1.2' into cassandra-2.0	2013-12-17 11:04:03 -08:00
native_protocol_v2.spec	ninja-correcting the the constant for LOCAL_ONE in v2 of the native_protocol doc.	2013-12-17 11:05:06 -08:00