cassandra/test
Benedict Elliott Smith 8c5ce66fe3 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/SecondaryIndex.java
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
2015-05-07 11:57:52 +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 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-04-15 10:21:59 -05: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 2015-05-07 11:57:52 +01:00