Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/369415c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/369415c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/369415c2 Branch: refs/heads/trunk Commit: 369415c262e95cb0ebbb9ea6325f3ce76747fb08 Parents: bdc8e26 e873213 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jul 30 14:33:42 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jul 30 14:33:42 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/369415c2/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java ----------------------------------------------------------------------