Marcus Eriksson 86b6ec5299 Merge branch 'cassandra-2.0' into cassandra-2.1 ... Conflicts: CHANGES.txt test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java		2014-05-27 10:43:50 +02: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 cassandra-2.1	2014-05-27 10:43:50 +02: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	Add missing entry in protocol spec (#6954)	2014-03-31 17:43:41 +02:00
native_protocol_v3.spec	Change serialization format for UDT	2014-05-20 18:29:52 +02:00