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
..
burn/org/apache/cassandra	Improve BTree	2015-07-15 11:28:11 +01:00
conf	Storage engine refactor, a.k.a CASSANDRA-8099	2015-06-30 12:47:01 +02:00
data	ninja-fix missing test file	2015-07-05 23:45:40 +07:00
long/org/apache/cassandra	Merge branch 'cassandra-2.2' into trunk	2015-07-16 15:29:02 +02: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 'cassandra-2.2' into trunk	2015-07-16 23:02:47 +02:00