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/fcc40e58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcc40e58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcc40e58 Branch: refs/heads/cassandra-3.0 Commit: fcc40e58869df76cf8f6c6e066f9aef2bd9d4b1a Parents: 7a3c3ab 97f3aa6 Author: Robert Stupp <sn...@snazy.de> Authored: Wed Feb 17 13:42:54 2016 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed Feb 17 13:42:54 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 4 ++-- pylib/cqlshlib/cqlhandling.py | 3 ++- pylib/cqlshlib/test/cassconnect.py | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcc40e58/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f1a9719,288f204..1d89446 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,7 +1,19 @@@ -2.2.6 +3.0.4 + * 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) +Merged from 2.2: + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) - * Use cloned TokenMetadata in size estimates to avoid race against membership check - (CASSANDRA-10736) * Always persist upsampled index summaries (CASSANDRA-10512) * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcc40e58/bin/cqlsh.py ----------------------------------------------------------------------
