Aleksey Yeschenko 26995337b8 Merge branch 'cassandra-1.1' into cassandra-1.2 ... Conflicts: test/unit/org/apache/cassandra/service/CassandraServerTest.java		2013-05-11 01:37:00 +03:00
..
conf	Add CQL3-based implementations of IAuthenticator and IAuthorizer	2013-02-15 01:26:10 +03:00
data	resurrect ScrubTest	2013-04-23 10:24:18 -05:00
long/org/apache/cassandra	fix potential for multiple concurrent compactions of the same sstables	2013-02-20 05:38:57 -08: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	Merge branch 'cassandra-1.1' into cassandra-1.2	2013-05-11 01:37:00 +03:00
unit/org/apache/cassandra	Merge branch 'cassandra-1.1' into cassandra-1.2	2013-05-11 01:37:00 +03:00
cassandra.in.sh	Ninja-unify 1.1/1.2/2.0 system tests	2013-05-06 01:56:43 +03:00