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

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

commit 9dbebb0b6fb83bad54b1a123b1ae94160336de5d
Merge: 876f7b0 ea3cca0
Author: Brandon Williams <[email protected]>
AuthorDate: Tue Sep 21 09:24:05 2021 -0500

    Merge branch 'cassandra-3.0' into cassandra-3.11

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

diff --cc CHANGES.txt
index 41fe427,432faa8..e70d3d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -3.0.26:
 +3.11.12
 + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
 + * Include SASI components to snapshots (CASSANDRA-15134)
 + * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * 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.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)

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

Reply via email to