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/a64ad4e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a64ad4e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a64ad4e0 Branch: refs/heads/trunk Commit: a64ad4e0f9ee937199ed25d4f5398921a90a7796 Parents: 9995521 6d383be Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Mar 17 10:10:39 2016 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Mar 17 10:10:39 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a64ad4e0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b264609,fdb5807..c3d218a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,9 +1,16 @@@ -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: + * 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) - * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196) - * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) * Add missing newline at end of bin/cqlsh (CASSANDRA-11325) * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a64ad4e0/doc/cql3/CQL.textile ----------------------------------------------------------------------