Sylvain Lebresne f8f80d3e50 Merge branch 'cassandra-1.2' into trunk		2012-12-07 10:14:16 +01:00
..
conf	r/m obsolete and unnecessary rpc_timeout_in_ms override from test config	2012-12-04 21:58:20 -06:00
data	update test data for SerializationsTest	2012-11-21 17:34:28 -06:00
long/org/apache/cassandra	make index_interval configurable per columnfamily	2012-12-01 10:03:52 +09: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	Add describe_token_map call.	2012-04-10 15:25:57 -05:00
unit/org/apache/cassandra	Merge branch 'cassandra-1.2' into trunk	2012-12-07 10:14:16 +01:00
cassandra.in.sh	Allow overriding RING_DELAY.	2011-12-12 18:22:13 +00:00