This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 81f8a9f29df5751b0b2aef7c4f6374395c67f2a9 Merge: 2fc090c 1caaa9c Author: Mick Semb Wever <[email protected]> AuthorDate: Fri Aug 28 09:44:16 2020 +0200 Merge branch 'cassandra-2.2' into cassandra-3.0 CHANGES.txt | 3 ++- src/java/org/apache/cassandra/service/CassandraDaemon.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index 5b23245,d6edbe9..765097b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,41 -1,9 +1,42 @@@ -2.2.18 +3.0.22: + * Fix gossip shutdown order (CASSANDRA-15816) + * Remove broken 'defrag-on-read' optimization (CASSANDRA-15432) + * Check for endpoint collision with hibernating nodes (CASSANDRA-14599) + * Operational improvements and hardening for replica filtering protection (CASSANDRA-15907) + * stop_paranoid disk failure policy is ignored on CorruptSSTableException after node is up (CASSANDRA-15191) + * 3.x fails to start if commit log has range tombstones from a column which is also deleted (CASSANDRA-15970) + * Forbid altering UDTs used in partition keys (CASSANDRA-15933) + * Fix empty/null json string representation (CASSANDRA-15896) + * Handle difference in timestamp precision between java8 and java11 in LogFIle.java (CASSANDRA-16050) +Merged from 2.2: * Fix CQL parsing of collections when the column type is reversed (CASSANDRA-15814) - + Merged from 2.1: + * Only allow strings to be passed to JMX authentication (CASSANDRA-16077) -2.2.17 +3.0.21 + * Backport CASSANDRA-12189: escape string literals (CASSANDRA-15948) + * Avoid hinted handoff per-host throttle being arounded to 0 in large cluster (CASSANDRA-15859) + * Avoid emitting empty range tombstones from RangeTombstoneList (CASSANDRA-15924) + * Avoid thread starvation, and improve compare-and-swap performance, in the slab allocators (CASSANDRA-15922) + * Fix broken KEYS 2i queries after DROP COMPACT STORAGE (CASSANDRA-15906) + * Add token to tombstone warning and error messages (CASSANDRA-15890) + * Fixed range read concurrency factor computation and capped as 10 times tpc cores (CASSANDRA-15752) + * Catch exception on bootstrap resume and init native transport (CASSANDRA-15863) + * Fix replica-side filtering returning stale data with CL > ONE (CASSANDRA-8272, CASSANDRA-8273) + * Fix duplicated row on 2.x upgrades when multi-rows range tombstones interact with collection ones (CASSANDRA-15805) + * Rely on snapshotted session infos on StreamResultFuture.maybeComplete to avoid race conditions (CASSANDRA-15667) + * EmptyType doesn't override writeValue so could attempt to write bytes when expected not to (CASSANDRA-15790) + * Fix index queries on partition key columns when some partitions contains only static data (CASSANDRA-13666) + * Avoid creating duplicate rows during major upgrades (CASSANDRA-15789) + * liveDiskSpaceUsed and totalDiskSpaceUsed get corrupted if IndexSummaryRedistribution gets interrupted (CASSANDRA-15674) + * Fix Debian init start/stop (CASSANDRA-15770) + * Fix infinite loop on index query paging in tables with clustering (CASSANDRA-14242) + * Fix chunk index overflow due to large sstable with small chunk length (CASSANDRA-15595) + * cqlsh return non-zero status when STDIN CQL fails (CASSANDRA-15623) + * Don't skip sstables in slice queries based only on local min/max/deletion timestamp (CASSANDRA-15690) + * Memtable memory allocations may deadlock (CASSANDRA-15367) + * Run evictFromMembership in GossipStage (CASSANDRA-15592) +Merged from 2.2: * Fix nomenclature of allow and deny lists (CASSANDRA-15862) * Remove generated files from source artifact (CASSANDRA-15849) * Remove duplicated tools binaries from tarballs (CASSANDRA-15768) diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index 14d8aab,86e2464..666ca72 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -33,8 -34,10 +33,9 @@@ import java.rmi.registry.Registry import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; import java.util.Collections; + import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.UUID; import java.util.concurrent.TimeUnit; import javax.management.ObjectName; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
