Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a4d6beb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a4d6beb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a4d6beb Branch: refs/heads/cassandra-2.0 Commit: 3a4d6beb4d42b0400f2fef511fecf699fc68e00a Parents: d38ca32 8e7d728 Author: Brandon Williams <[email protected]> Authored: Tue Nov 5 15:27:28 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Nov 5 15:27:28 2013 -0600 ---------------------------------------------------------------------- .../hadoop/cql3/CqlPagingRecordReader.java | 32 ++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a4d6beb/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java ----------------------------------------------------------------------
