Brandon Williams 5bd6a756e1 Merge branch 'cassandra-2.0' into cassandra-2.1 ... Conflicts: CHANGES.txt		2014-05-01 15:14:34 -05:00
..
conf	Update versions and add licenses for 2.1-beta2 release	2014-05-01 16:40:15 +02:00
data	Add missing files	2014-02-08 13:22:13 +01:00
long/org/apache/cassandra	Push more of memtable data off-heap	2014-04-29 13:58:20 +02:00
pig/org/apache	merge from 2.0	2014-03-14 15:40:04 -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	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 cassandra-2.1	2014-05-01 15:14:34 -05:00
cassandra.in.sh	Ninja-unify 1.1/1.2/2.0 system tests	2013-05-06 01:56:43 +03:00