Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc5edc02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc5edc02 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc5edc02 Branch: refs/heads/cassandra-2.1 Commit: cc5edc02262b783182a9668603e5f38a119b025b Parents: 44ed78a bbe607f Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 25 12:59:05 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 25 12:59:05 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 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 +- .../apache/cassandra/db/ConsistencyLevel.java | 2 + .../cassandra/hadoop/cql3/CqlConfigHelper.java | 541 +------------------ .../cassandra/hadoop/cql3/CqlInputFormat.java | 80 --- .../hadoop/cql3/CqlPagingRecordReader.java | 2 +- .../cassandra/hadoop/cql3/CqlRecordReader.java | 260 --------- 11 files changed, 32 insertions(+), 996 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc5edc02/CHANGES.txt ----------------------------------------------------------------------
