Tyler Hobbs 2a4ab8716a Merge branch 'cassandra-2.1' into cassandra-2.2		2015-06-26 14:57:27 -05:00
..
burn/org/apache/cassandra	Introduce test-burn ant target	2015-05-06 17:51:48 +01:00
conf	Remove use of Cell in Thrift M/R classes	2015-06-04 10:46:57 +01:00
data	Expand upgrade testing for commitlog changes	2015-06-24 12:47:59 -04:00
long/org/apache/cassandra	Expand upgrade testing for commitlog changes	2015-06-24 12:47:59 -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 Thrift dependencies in bundled tools	2015-05-05 23:57:39 +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.1' into cassandra-2.2	2015-06-26 14:57:27 -05:00