cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [17/17] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 18 Jul 2014 17:36:53 GMT
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/3d9db291
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d9db291
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d9db291

Branch: refs/heads/trunk
Commit: 3d9db291af2accb34dbd72d6438b0e959e1411da
Parents: ddc0f66 0ad1706
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Jul 18 12:36:31 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Jul 18 12:36:31 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(-)
----------------------------------------------------------------------



Mime
View raw message