Benedict Elliott Smith ac4a0263fe Merge branch 'cassandra-2.1' into trunk ... Conflicts: test/unit/org/apache/cassandra/db/CommitLogTest.java		2014-07-10 10:01:19 +01:00
..
conf	ninja fix: raise default concurrent compactors to 4 to avoid LCS test timeout	2014-07-01 14:39:12 -04:00
data	ninja fix LegacySSTable test with new versioned files from 2.0	2014-07-09 16:21:36 -04:00
long/org/apache/cassandra	Reduce unit test times due to schema loading	2014-06-20 12:55:35 -05:00
pig/org/apache	Merge branch 'cassandra-2.0' into cassandra-2.1	2014-05-14 14:33:29 -05:00
resources	make sstable2json output more readable, and remove support for supercolumn json (CASSANDRA-7078)	2014-04-23 22:00:21 -05:00
system	add Thrift get_multi_slice call	2014-03-05 08:02:59 -06:00
unit/org/apache/cassandra	Merge branch 'cassandra-2.1' into trunk	2014-07-10 10:01:19 +01:00
cassandra.in.sh	Ninja-unify 1.1/1.2/2.0 system tests	2013-05-06 01:56:43 +03:00