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/5861cd8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5861cd8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5861cd8f Branch: refs/heads/trunk Commit: 5861cd8fe2e5427b791672c6db61d2d43d925646 Parents: 4d7141f 9a8406f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Jul 11 14:55:05 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Jul 11 15:00:03 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 6 +++--- src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5861cd8f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4241da8,837c3fb..70210a8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,32 -1,17 +1,32 @@@ -2.2.8 +3.0.9 + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) - 2.2.8 - * Use dedicated thread for JMX notifications (CASSANDRA-12146) - * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098) + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) + * Fix column ordering of results with static columns for Thrift requests in + a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of + those static columns in query results (CASSANDRA-12123) + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) + * Fix EOF exception when altering column type (CASSANDRA-11820) +Merged from 2.2: + * Synchronize ThriftServer::stop() (CASSANDRA-12105) + * Use dedicated thread for JMX notifications (CASSANDRA-12146) - * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143) + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) Merged from 2.1: - * Don't write shadowed range tombstone (CASSANDRA-12030) - * Improve digest calculation in the presence of overlapping tombstones (CASSANDRA-11349) * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907) - * Account for partition deletions in tombstone histogram (CASSANDRA-12112) -2.2.7 +3.0.8 + * Fix potential race in schema during new table creation (CASSANDRA-12083) + * cqlsh: fix error handling in rare COPY FROM failure scenario (CASSANDRA-12070) + * Disable autocompaction during drain (CASSANDRA-11878) + * Add a metrics timer to MemtablePool and use it to track time spent blocked on memory in MemtableAllocator (CASSANDRA-11327) + * Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023) + * Add TimeWindowCompactionStrategy (CASSANDRA-9666) +Merged from 2.2: * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755) * Validate bloom_filter_fp_chance against lowest supported value when the table is created (CASSANDRA-11920)
