Brandon Williams 8a4abdda1e Merge branch 'cassandra-2.1' into trunk ... Conflicts: src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java		2015-01-13 11:28:07 -06:00
..
hadoop_cql3_word_count	fix errant CPIF references	2015-01-12 11:57:53 -06:00
hadoop_word_count	Remove cassandra-cli	2014-09-24 18:33:29 -07:00
pig	Pig: Refactor and deprecate CqlStorage	2015-01-13 11:24:45 -06:00
triggers	switch external naming of 'column families' to 'tables'	2014-06-18 23:30:02 -04:00