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/62a0222a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62a0222a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62a0222a Branch: refs/heads/cassandra-2.1 Commit: 62a0222aa4ae3462355a6089fda6304e81a34487 Parents: ebaa755 e615960 Author: Jonathan Ellis <[email protected]> Authored: Wed Mar 26 20:50:39 2014 -0700 Committer: Jonathan Ellis <[email protected]> Committed: Wed Mar 26 20:50:39 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
