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

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

commit abe6d859f2c25882e7b4574b6e13eb5167c377e8
Merge: 42c2bd4bad c485440de3
Author: Mick Semb Wever <[email protected]>
AuthorDate: Fri Jul 5 16:42:59 2024 +0200

    Merge branch 'cassandra-3.0' into cassandra-3.11
    
    * cassandra-3.0:
      Add termin-8-jdk as a valid jdk8 candidate in the debian package

 CHANGES.txt    | 3 ++-
 debian/control | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index 224e866abd,7ce9a42507..2f7657b49f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,10 +1,15 @@@
 -3.0.31
 +3.11.18
 +Merged from 3.0:
   * Upgrade OWASP to 10.0.0 (CASSANDRA-19738)
- 
+ Merged from 2.2:
+  * Add termin-8-jdk as a valid jdk8 candidate in the debian package 
(CASSANDRA-19752)
  
 -
 -3.0.30
 +3.11.17
 + * Move ClientWarn.State#warnings to a thread-safe list (CASSANDRA-19427)
 + * Fix delayed SSTable release with unsafe_aggressive_sstable_expiration 
(CASSANDRA-18756)
 + * Revert CASSANDRA-18543 (CASSANDRA-18854)
 + * Fix NPE when using udfContext in UDF after a restart of a node 
(CASSANDRA-18739)
 +Merged from 3.0:
   * Fix SCM URL link (CASSANDRA-19422)
   * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824)
   * Suppress CVE-2023-6378 (CASSANDRA-19142) 


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

Reply via email to