This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ca218cc012dd8a345259bd75e945eeebdf77eef1
Merge: da2b35b 04c1289
Author: Brandon Williams <[email protected]>
AuthorDate: Tue Mar 8 17:23:30 2022 -0600

    Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt                                               | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 7 +++++++
 2 files changed, 9 insertions(+)

diff --cc CHANGES.txt
index b2cbe0f,af8983a..1b396b9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -130,24 -43,15 +130,26 @@@ Merged from 4.0
   * Avoid rewriting all sstables during cleanup when transient replication is 
enabled (CASSANDRA-16966)
   * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987)
   * Avoid trying to acquire 0 permits from the rate limiter when taking 
snapshot (CASSANDRA-16872)
 - * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153)
 - * Include SASI components to snapshots (CASSANDRA-15134)
 - * Fix missed wait latencies in the output of `nodetool tpstats -F` 
(CASSANDRA-16938)
   * Remove all the state pollution between tests in SSTableReaderTest 
(CASSANDRA-16888)
   * Delay auth setup until after gossip has settled to avoid unavailables on 
startup (CASSANDRA-16783)
 - * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
   * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData 
includes data twice (CASSANDRA-16900)
 + * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
   * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 + * Tolerate missing DNS entry when completing a host replacement 
(CASSANDRA-16873)
 + * Harden PrunableArrayQueue against Pruner implementations that might throw 
exceptions (CASSANDRA-16866)
 + * Move RepairedDataInfo to the execution controller rather than the 
ReadCommand to avoid unintended sharing (CASSANDRA-16721)
 + * Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
 + * Remove assumption that all urgent messages are small (CASSANDRA-16877)
 + * ArrayClustering.unsharedHeapSize does not include the data so undercounts 
the heap size (CASSANDRA-16845)
 + * Improve help, doc and error messages about sstabledump -k and -x arguments 
(CASSANDRA-16818)
 + * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
 + * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
 + * Improve DiagnosticEventService.publish(event) logging message of events 
(CASSANDRA-16749)
 + * Cleanup dependency scopes (CASSANDRA-16704)
 + * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() 
thread-safe (CASSANDRA-16707)
  Merged from 3.11:
++ * dropping of a materialized view creates a snapshot with dropped- prefix 
(CASSANDRA-17415)
++ * Validate existence of DCs when repairing (CASSANDRA-17407)
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to