Merge branch 'cassandra-2.1.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/70f277f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70f277f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70f277f5 Branch: refs/heads/trunk Commit: 70f277f50ead8129594f1e533ccf6283e083d851 Parents: 993f4f5 5172860 Author: Brandon Williams <[email protected]> Authored: Tue Aug 12 13:33:48 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Aug 12 13:33:48 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
