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/e1e28d0f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1e28d0f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1e28d0f Branch: refs/heads/trunk Commit: e1e28d0f0d9a6b4bca97cfd081c042180814bff3 Parents: 9529fba edf48f8 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Jan 7 02:26:43 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Jan 7 02:26:43 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/e1e28d0f/examples/hadoop_cql3_word_count/src/WordCount.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1e28d0f/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java ----------------------------------------------------------------------
