Brandon Williams 9d41638ab4 Merge branch 'cassandra-2.0' into trunk ... Conflicts: build.xml		2014-01-31 09:40:48 -06:00
..
conf	Fix logback config in scripts and packaging.	2014-01-10 09:31:12 -06:00
data	Fix serialization test	2014-01-14 20:23:35 -06:00
long/org/apache/cassandra	remove Table.switchlock and introduce o.a.c.utils.memory package	2014-01-30 17:09:18 -06:00
pig/org/apache	Fix logback config in scripts and packaging.	2014-01-10 09:31:12 -06:00
resources	Fix logback config in scripts and packaging.	2014-01-10 09:31:12 -06:00
system	update test for separate paxos/commit CLs	2013-08-05 16:27:39 -05:00
unit/org/apache/cassandra	Merge branch 'cassandra-2.0' into trunk	2014-01-31 09:40:48 -06:00
cassandra.in.sh	Ninja-unify 1.1/1.2/2.0 system tests	2013-05-06 01:56:43 +03:00