Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d6ab6fb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d6ab6fb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d6ab6fb Branch: refs/heads/trunk Commit: 2d6ab6fb50aebfb48e51e040a346731b5b1ff602 Parents: 5909b5f 3a4d6be Author: Brandon Williams <[email protected]> Authored: Tue Nov 5 15:27:48 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Nov 5 15:27:48 2013 -0600 ---------------------------------------------------------------------- .../hadoop/cql3/CqlPagingRecordReader.java | 32 ++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
