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/cb871ba9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb871ba9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb871ba9 Branch: refs/heads/trunk Commit: cb871ba908dac0e8773a50dc805b272ac2c794d1 Parents: 0619da2 5008507 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Nov 13 18:01:51 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Nov 13 18:01:51 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamily.java | 5 ++ .../service/pager/AbstractQueryPager.java | 49 ++++++++++++++------ .../service/pager/RangeNamesQueryPager.java | 5 ++ .../service/pager/RangeSliceQueryPager.java | 9 +++- .../service/pager/SliceQueryPager.java | 9 +++- .../cassandra/service/QueryPagerTest.java | 32 ++++++++++++- 7 files changed, 92 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb871ba9/CHANGES.txt ----------------------------------------------------------------------
