Aleksey Yeschenko f20b097821 Merge branch 'cassandra-2.1' into trunk ... Conflicts: doc/cql/CQL.textile src/java/org/apache/cassandra/cql/CFPropDefs.java		2014-07-03 21:41:28 +03:00
..
client_only	Remove left-over populate_io_cache_on_flush and replicate_on_write uses	2014-07-03 21:35:39 +03:00
hadoop_cql3_word_count	Add CqlRecordReader to take advantage of native CQL pagination	2014-03-26 15:34:59 +01:00
hadoop_word_count	Rename Column to Cell	2013-12-17 17:52:20 +01:00
pig	update pig example scripts	2013-11-20 10:19:17 -06:00
triggers	switch external naming of 'column families' to 'tables'	2014-06-18 23:30:02 -04:00