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/b808a180 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b808a180 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b808a180 Branch: refs/heads/cassandra-3.0 Commit: b808a1806448884d6c7aa20c1c0812b92c40e9a5 Parents: d0b7a02 f791589 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Mar 9 11:42:58 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Mar 9 11:42:58 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b808a180/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e6c40aa,d7b0fc2..5efb1b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,12 +1,41 @@@ -2.2.6 +3.0.5 + * 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: + * 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) - * Fix filtering on non-primary key columns for thrift static column families - (CASSANDRA-6377) * Only log yaml config once, at startup (CASSANDRA-11217) - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) * Reference leak with parallel repairs on the same table (CASSANDRA-11215) +Merged from 2.1: + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) + * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) + +3.0.4 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * MV should only query complex columns included in the view (CASSANDRA-11069) + * Failed aggregate creation breaks server permanently (CASSANDRA-11064) + * Add sstabledump tool (CASSANDRA-7464) + * Introduce backpressure for hints (CASSANDRA-10972) + * Fix ClusteringPrefix not being able to read tombstone range boundaries (CASSANDRA-11158) + * Prevent logging in sandboxed state (CASSANDRA-11033) + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) + * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239) +Merged from 2.2: + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)