Aleksey Yeschenko cb8ce83257 Merge branch 'cassandra-2.1' into trunk ... Conflicts: test/system/test_thrift_server.py		2014-08-12 00:18:54 +03:00
..
conf	Merge branch 'cassandra-2.1.0' into cassandra-2.1	2014-08-01 11:17:23 -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	Merge branch 'cassandra-2.1' into trunk	2014-08-07 14:53:30 -04:00
pig/org/apache	Fix pig tests.	2014-08-08 17:45:25 +02:00
resources	make sstable2json output more readable, and remove support for supercolumn json (CASSANDRA-7078)	2014-04-23 22:00:21 -05:00
unit/org/apache/cassandra	Merge branch 'cassandra-2.1' into trunk	2014-08-11 13:03:47 -05:00
cassandra.in.sh	Ninja-unify 1.1/1.2/2.0 system tests	2013-05-06 01:56:43 +03:00