Jason Brown 255e5f14ca Merge branch 'cassandra-2.2' into trunk		2015-06-05 05:41:55 -07: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	CASSANDRA-8049 follow up: only check versioning of *.db files at startup	2015-05-06 13:07:06 +03:00
long/org/apache/cassandra	Merge branch 'cassandra-2.2' into trunk	2015-06-05 05:41:55 -07: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	Remove wrapping compaction strategy	2015-06-05 10:34:04 +02:00