Jonathan Ellis 5c21711e76 merge from 2.0		2013-11-03 00:08:41 -05:00
..
conf	Merge branch 'cassandra-2.0' into trunk	2013-10-14 14:19:20 -05:00
data	Remove multithreaded compaction and PCR	2013-10-30 10:17:23 -05:00
long/org/apache/cassandra	replace import junit.framework.* with org.junit.* (junit3 vs junit4)	2013-08-31 21:33:08 -04:00
resources	new json format with row level deletion; patch by David Alves, reviewed by yukim for CASSANDRA-4054	2012-07-12 10:40:24 -05:00
system	update test for separate paxos/commit CLs	2013-08-05 16:27:39 -05:00
unit/org/apache	merge from 2.0	2013-11-03 00:08:41 -05:00
cassandra.in.sh	Ninja-unify 1.1/1.2/2.0 system tests	2013-05-06 01:56:43 +03:00