blerer 689582c044 Merge 'cassandra-2.2' into trunk ... Conflicts: test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java		2015-07-16 23:02:47 +02:00
..
cql3	Merge 'cassandra-2.2' into trunk	2015-07-16 23:02:47 +02:00
native_protocol_v1.spec	Merge branch 'cassandra-2.0' into cassandra-2.1	2015-05-12 16:23:32 -05:00
native_protocol_v2.spec	Merge branch 'cassandra-2.0' into cassandra-2.1	2015-05-12 16:23:32 -05:00
native_protocol_v3.spec	Merge branch 'cassandra-2.0' into cassandra-2.1	2015-05-12 16:23:32 -05:00
native_protocol_v4.spec	Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)	2015-05-20 08:48:53 +02:00