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/025b84ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/025b84ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/025b84ef Branch: refs/heads/trunk Commit: 025b84efd6c79504893c69e8f3860d8ad512f6ca Parents: 341d6c4 55211bc Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 29 10:10:34 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 29 10:10:34 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../service/pager/AbstractQueryPager.java | 43 +++-- .../service/pager/AbstractQueryPagerTest.java | 184 +++++++++++++++++++ 3 files changed, 216 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/025b84ef/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/025b84ef/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java ----------------------------------------------------------------------