cassandra/test
Marcus Eriksson b53fefa731 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
2014-12-24 14:00:05 +01:00
..
conf move tests back to debug 2014-10-23 13:11:04 -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 Avoid recycling CL segments until all writes have been flushed for all keyspaces in segment 2014-08-27 10:59:14 -04:00
pig/org/apache use correct native port in pig-test 2014-09-05 08:13:49 -05:00
resources Handle CQL row marker in SSTableImport 2014-08-15 13:11:47 -07:00
unit/org/apache/cassandra Merge branch 'cassandra-2.0' into cassandra-2.1 2014-12-24 14:00:05 +01:00