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

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

commit 053806c320e65549c3b911f1b68b50db9d1bcedb
Merge: 86aaf22 9dbebb0
Author: Brandon Williams <[email protected]>
AuthorDate: Tue Sep 21 09:24:43 2021 -0500

    Merge branch 'cassandra-3.11' into cassandra-4.0

 CHANGES.txt | 3 +++
 debian/init | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index c72dd0e,e70d3d7..01e0141
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,30 +1,39 @@@
 -3.11.12
 - * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
 +4.0.2
 + * 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)
 - * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * 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)
   * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
 - * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 - * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 - * Fix ant-junit dependency issue (CASSANDRA-16827)
 - * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
 - * Avoid sending CDC column if not enabled (CASSANDRA-16770)
 +Merged from 3.11:
 + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
 + * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
  Merged from 3.0:
+  * Debian init respects CASSANDRA_HEAPDUMP_DIR (CASSANDRA-13843)
+  * Catch UnsatisfiedLinkError in WindowsTimer (CASSANDRA-16085)
+  * Avoid removing batch when it's not created during view replication 
(CASSANDRA-16175)
   * Make the addition of regular column to COMPACT tables throw an 
InvalidRequestException (CASSANDRA-14564)
 - * Fix materialized view schema backup as table (CASSANDRA-12734)
 - * Avoid signaling DigestResolver until the minimum number of responses are 
guaranteed to be visible (CASSANDRA-16883)
 - * Fix secondary indexes on primary key columns skipping some writes 
(CASSANDRA-16868)
 - * Fix incorrect error message in LegacyLayout (CASSANDRA-15136)
 - * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
 - * Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() 
(CASSANDRA-16578)
 - * Remove mutation data from error log message (CASSANDRA-16817)
 -Merged from 2.2:
 - * Add python2 location to RPMs (CASSANDRA-16822)
 -
  
 -3.11.11
 +4.0.1
 + * 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:
 + * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 + * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 + * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
   * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
   * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
   * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)

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

Reply via email to