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/fef40a5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fef40a5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fef40a5a Branch: refs/heads/trunk Commit: fef40a5ae03978fa74444e27ae020e8ccb4897d8 Parents: 96171d3 57fa76f Author: Brandon Williams <[email protected]> Authored: Tue May 20 10:57:33 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 20 10:57:33 2014 -0500 ---------------------------------------------------------------------- .../hadoop/cql3/CqlPagingRecordReader.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
