Sam Tunnicliffe 3572cfdce4 Merge branch 'cassandra-2.2' into trunk		2015-06-25 10:02:54 +01:00
..
burn/org/apache/cassandra	Remove FileCacheService, instead pooling buffers	2015-06-09 10:08:24 +01:00
conf	Improve log output from unit tests	2015-06-24 08:09:52 +02:00
data	Expand upgrade testing for commitlog changes	2015-06-24 12:47:59 -04:00
long/org/apache/cassandra	Merge branch 'cassandra-2.2' into trunk	2015-06-24 12:50:26 -04:00
microbench/org/apache/cassandra/test/microbench	follow up to CASSANDRA-8670, cleaning up benchmark	2015-04-09 12:10:27 +01:00
pig/org/apache	Remove deprecated legacy Hadoop code	2015-06-08 22:41:28 +03:00
resources	Handle CQL row marker in SSTableImport	2014-08-15 13:11:47 -07:00
unit/org/apache/cassandra	Merge branch 'cassandra-2.2' into trunk	2015-06-25 10:02:54 +01:00