Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/029b22e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/029b22e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/029b22e8 Branch: refs/heads/cassandra-2.2 Commit: 029b22e84d13f714b9a999fe7d6a1e6f8a5cfc0a Parents: d295c7c 6fe70c6 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Feb 8 15:52:07 2016 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Feb 8 15:52:07 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/029b22e8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b0a5062,806e6d5..770c394 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,9 +1,40 @@@ -2.1.14 +2.2.6 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) - * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) + * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) +Merged from 2.1: + * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) + * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113) -2.1.13 - * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113) +2.2.5 + * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949) + * Apply change to compaction throughput in real time (CASSANDRA-10025) + * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955) + * Avoid over-fetching during the page of range queries (CASSANDRA-8521) + * Start L0 STCS-compactions even if there is a L0 -> L1 compaction + going (CASSANDRA-10979) + * Make UUID LSB unique per process (CASSANDRA-7925) + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980) + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465) + * Fix error streaming section more than 2GB (CASSANDRA-10961) + * (cqlsh) Also apply --connect-timeout to control connection + timeout (CASSANDRA-10959) + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975) + * Enable GC logging by default (CASSANDRA-10140) + * Optimize pending range computation (CASSANDRA-9258) + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) + * drop/alter user should be case sensitive (CASSANDRA-10817) + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977) + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) + * Add new types to Stress (CASSANDRA-9556) + * Add property to allow listening on broadcast interface (CASSANDRA-9748) + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) + * Better handling of SSL connection errors inter-node (CASSANDRA-10816) + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) + * (cqlsh) encode input correctly when saving history +Merged from 2.1: * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938) * Fix isJoined return true only after becoming cluster member (CASANDRA-11007) * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
