Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57fa76fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57fa76fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57fa76fd Branch: refs/heads/cassandra-2.1 Commit: 57fa76fda2c54c2f17c44e2cd0d0e6517feb833a Parents: 8465a91 1b9f712 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 20 10:57:15 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 20 10:57:15 2014 -0500 ---------------------------------------------------------------------- .../hadoop/cql3/CqlPagingRecordReader.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57fa76fd/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java ----------------------------------------------------------------------
