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/e975ab8c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e975ab8c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e975ab8c Branch: refs/heads/trunk Commit: e975ab8c5ffaa368d4ed7153be31c1fc7d3a6fc4 Parents: 3f8816f 3d93053 Author: Sylvain Lebresne <[email protected]> Authored: Tue Feb 25 10:46:10 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Feb 25 10:46:10 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../service/pager/AbstractQueryPager.java | 8 ++-- .../service/pager/RangeSliceQueryPager.java | 13 ++++-- .../service/pager/SliceQueryPager.java | 13 +++++- .../unit/org/apache/cassandra/SchemaLoader.java | 9 +++- .../cassandra/service/QueryPagerTest.java | 44 ++++++++++++++++++-- 6 files changed, 74 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e975ab8c/CHANGES.txt ----------------------------------------------------------------------
