Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48bf2b13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48bf2b13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48bf2b13 Branch: refs/heads/trunk Commit: 48bf2b13178b8997c1882403e0efceb1f86f3520 Parents: e90489f 6df3163 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Mar 25 16:53:38 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 25 16:53:38 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 - build.xml | 3 - examples/hadoop_cql3_word_count/bin/word_count | 3 +- .../bin/word_count_counters | 4 +- .../hadoop_cql3_word_count/src/WordCount.java | 77 +-- .../src/WordCountCounters.java | 54 +- .../cassandra/hadoop/cql3/CqlConfigHelper.java | 541 +------------------ .../cassandra/hadoop/cql3/CqlInputFormat.java | 80 --- .../hadoop/cql3/CqlPagingRecordReader.java | 2 +- .../cassandra/hadoop/cql3/CqlRecordReader.java | 260 --------- 10 files changed, 29 insertions(+), 996 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48bf2b13/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48bf2b13/build.xml ----------------------------------------------------------------------
