Merge branch cassandra-3.0 into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47a2d48a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47a2d48a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47a2d48a Branch: refs/heads/trunk Commit: 47a2d48a0690ab66ad43b752f3e1d1814b5e7f1e Parents: 96a6e2e 60b23b1 Author: Benjamin Lerer <[email protected]> Authored: Thu Mar 10 12:00:42 2016 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Thu Mar 10 12:00:42 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/service/pager/AbstractQueryPager.java | 7 +++++-- src/java/org/apache/cassandra/service/pager/PagingState.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47a2d48a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ff67a2b,864a33d..58c7ed0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,6 +1,7 @@@ -3.0.5 +3.5 +Merged from 3.0: + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) + * Remove recursive call from CompositesSearcher (CASSANDRA-11304) * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377) * Fix sstableloader fail when using materialized view (CASSANDRA-11275) Merged from 2.2: http://git-wip-us.apache.org/repos/asf/cassandra/blob/47a2d48a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java ----------------------------------------------------------------------
