Merge branch 'cassandra-2.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/6124a733 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6124a733 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6124a733 Branch: refs/heads/cassandra-2.1 Commit: 6124a733cb1473f3951f2cae8dcaa9c83b9a3b8d Parents: 12b9691 e550ea6 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Dec 27 20:32:20 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Dec 27 20:32:20 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/6124a733/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java ----------------------------------------------------------------------
