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