Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f1339cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f1339cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f1339cc Branch: refs/heads/cassandra-3.0 Commit: 7f1339cc9f9f2e46406596cbe57bf8826afb57ba Parents: 8d101fd 42cd66a Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Mar 17 14:30:51 2016 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Mar 17 14:30:51 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/serializers/UTF8Serializer.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f1339cc/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c3d218a,fa4a726..defc25a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -2.2.6 +3.0.5 + * Add backpressure to compressed commit log (CASSANDRA-10971) + * SSTableExport supports secondary index tables (CASSANDRA-11330) + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) + * 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: + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748) * Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900) * Fix bloom filter sizing with LCS (CASSANDRA-11344) * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
