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/36b287be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36b287be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36b287be Branch: refs/heads/trunk Commit: 36b287bea4e98cfd737b17a3b3a9391a9654cd72 Parents: 17d9791 6124a73 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Dec 27 20:40:16 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Dec 27 20:40:16 2014 -0500 ---------------------------------------------------------------------- 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/36b287be/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java ----------------------------------------------------------------------
