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/70bf377b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70bf377b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70bf377b Branch: refs/heads/trunk Commit: 70bf377b0efe17b7bd431b1504371f27b33834b1 Parents: 35648e8 1d5d303 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Thu Oct 23 22:55:21 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Thu Oct 23 22:55:21 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70bf377b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ----------------------------------------------------------------------
