Robert Stupp 2cabf9c49d Merge branch 'cassandra-3.X' into trunk		2017-01-05 22:28:04 +01:00
..
burn/org/apache/cassandra	Merge branch 'cassandra-2.1' into cassandra-2.2	2015-09-30 19:47:14 +01:00
conf	Thrift removal	2016-12-13 10:27:12 +01:00
data	Remove pre-3.0 compatibility code for 4.0	2016-11-30 10:23:18 +01:00
long/org/apache/cassandra	Temporarily fix bug that creates commit log when running offline tools	2016-12-13 15:51:37 -08:00
microbench/org/apache/cassandra/test/microbench	Move to FastThreadLocalThread and FastThreadLocal	2016-12-13 17:37:47 +01:00
resources	Thrift removal	2016-12-13 10:27:12 +01:00
unit/org/apache/cassandra	Merge branch 'cassandra-3.X' into trunk	2017-01-05 22:28:04 +01:00