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/edf48f81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edf48f81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edf48f81 Branch: refs/heads/trunk Commit: edf48f81739d45978460a3413bad7252a34636d9 Parents: f8b43d4 e27cdf9 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Jan 7 02:25:59 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Jan 7 02:25:59 2015 +0300 ---------------------------------------------------------------------- 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, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edf48f81/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java ----------------------------------------------------------------------
