Merge branch 'cassandra-2.1.0' 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/0ad17060 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ad17060 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ad17060 Branch: refs/heads/trunk Commit: 0ad1706037d799885add47fffa282274e00e6797 Parents: e5625fc 8fd8832 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jul 18 12:36:20 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jul 18 12:36:20 2014 -0500 ---------------------------------------------------------------------- examples/hadoop_cql3_word_count/README.txt | 6 +++-- .../conf/log4j.properties | 2 +- .../src/WordCountSetup.java | 5 +++- examples/hadoop_word_count/README.txt | 6 +++-- .../hadoop_word_count/conf/log4j.properties | 2 +- examples/hadoop_word_count/src/WordCount.java | 5 +++- .../src/WordCountCounters.java | 2 ++ .../hadoop_word_count/src/WordCountSetup.java | 25 +++++++++++++++++++- 8 files changed, 44 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
