Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51728606 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51728606 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51728606 Branch: refs/heads/cassandra-2.1 Commit: 5172860618fd42b298a7a6d3c35b2e8edb7a7c03 Parents: 6795b6e 7ddcf3e Author: Brandon Williams <[email protected]> Authored: Tue Aug 12 13:33:32 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Aug 12 13:33:32 2014 -0500 ---------------------------------------------------------------------- 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/51728606/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ----------------------------------------------------------------------
