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/3b945483 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b945483 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b945483 Branch: refs/heads/trunk Commit: 3b945483bdb486487201923258421e3baa4a8b2a Parents: 7bd6d56 f6d0f43 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 12 11:57:36 2015 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 12 11:57:36 2015 -0600 ---------------------------------------------------------------------- examples/hadoop_cql3_word_count/src/WordCount.java | 3 +-- examples/hadoop_cql3_word_count/src/WordCountCounters.java | 3 +-- src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b945483/examples/hadoop_cql3_word_count/src/WordCount.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b945483/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java ----------------------------------------------------------------------
