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/02aad29e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02aad29e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02aad29e Branch: refs/heads/trunk Commit: 02aad29e876d78263bc85e9e2ce3fc619b7b7f8d Parents: 66b304e 7c4a889 Author: Sylvain Lebresne <[email protected]> Authored: Fri Mar 21 19:09:48 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Mar 21 19:09:48 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 3 ++- .../apache/cassandra/db/PagedRangeCommand.java | 24 +++++++++++++++----- .../cassandra/service/pager/QueryPagers.java | 10 ++++++-- .../service/pager/RangeSliceQueryPager.java | 3 ++- .../cassandra/db/ColumnFamilyStoreTest.java | 4 ++-- 6 files changed, 33 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02aad29e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02aad29e/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ----------------------------------------------------------------------
