Sylvain Lebresne 6c2ded6e98 Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1		2012-02-06 17:05:01 +01:00
..
conf	fix test config so localhost is seed	2011-08-17 14:50:53 +00:00
data	Allow concurrent schema migrations	2012-01-25 04:12:36 +02:00
long/org/apache/cassandra	Refactoring of the DatabaseDescriptor/CFMetadata/Table to support o.a.c.config.Schema which will be handling all schema quering/mutations	2011-08-22 23:16:04 +00:00
resources	merge from 0.8	2011-08-04 02:04:41 +00:00
system	Merge get_indexed_slices with get_range_slices	2012-01-02 17:03:18 +01:00
unit/org/apache/cassandra	Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1	2012-02-06 17:05:01 +01:00
cassandra.in.sh	Allow overriding RING_DELAY.	2011-12-12 18:22:13 +00:00