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

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

commit a0eecdb996963398049fbf5c1ee048f8d804a474
Merge: 60314f2d6a 449343138d
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Wed Sep 27 21:02:09 2023 +0200

    Merge branch 'cassandra-5.0' into trunk

 .build/parent-pom-template.xml | 2 +-
 CHANGES.txt                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 22ca1d0621,863b99740c..20588112aa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,12 -12,14 +17,13 @@@ Merged from 4.1
   * Internode legacy SSL storage port certificate is not hot reloaded on 
update (CASSANDRA-18681)
   * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466)
  Merged from 4.0:
 - * JMH improvements - faster build and async profiler (CASSANDRA-18871)
   * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844)
  Merged from 3.11:
 + * Revert CASSANDRA-18543 (CASSANDRA-18854)
  Merged from 3.0:
+  * Upgrade snappy-java to 1.1.10.4 (CASSANDRA-18878)
   * Add cqlshrc.sample and credentials.sample into Debian package 
(CASSANDRA-18818)
  
 -
  5.0-alpha1
   * Fix rpm installations to work with jdk17 (CASSANDRA-18817)
   * Fix Depends and Build-Depends for Java for Debian packages 
(CASSANDRA-18809)


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

Reply via email to