Jake Luciani 19c2d22e93 Merge branch 'cassandra-2.1' into trunk ... Conflicts: NEWS.txt build.xml		2014-11-05 16:04:24 -05:00
..
conf	Merge branch 'cassandra-2.1' into trunk	2014-10-23 13:11:10 -05:00
data	ninja fix LegacySSTable test with new versioned files from 2.0	2014-07-09 16:21:36 -04:00
long/org/apache/cassandra	Extend Descriptor to include a format value and refactor reader/writer apis	2014-10-23 11:10:55 -04:00
microbench/org/apache/cassandra/test/microbench	Integrate JMH into build system	2014-10-21 09:57:12 -04:00
pig/org/apache	Remove cassandra-cli	2014-09-24 18:33:29 -07: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 trunk	2014-11-05 16:04:24 -05:00