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/f3b2a6bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3b2a6bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3b2a6bc Branch: refs/heads/trunk Commit: f3b2a6bcb40e1bf8de26ffe21ff8e1be5d9b6ce4 Parents: a3c801e 815892e Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Mar 17 16:35:14 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Mar 17 16:35:14 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../hadoop_cql3_word_count/src/WordCount.java | 44 +++------------- .../src/WordCountCounters.java | 16 ++++++ .../src/WordCountSetup.java | 55 ++++---------------- 4 files changed, 35 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3b2a6bc/CHANGES.txt ----------------------------------------------------------------------
