natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Stefan Miklosovic 2025-03-19 12:33:38 +01:00
parent fb2aa5f386 8a98305aee
commit 9951225280
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.build/parent-pom-template.xml
View File

@ -302,7 +302,7 @@
<dependency> <dependency>
<groupId>com.github.luben</groupId> <groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId> <artifactId>zstd-jni</artifactId>
<version>1.5.7-1</version> <version>1.5.7-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>

1
CHANGES.txt
View File

@ -202,6 +202,7 @@ Merged from 4.1:
* Enforce CQL message size limit on multiframe messages (CASSANDRA-20052) * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
* Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365) * Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
Merged from 4.0: Merged from 4.0:
* Update zstd-jni to 1.5.7-2 (CASSANDRA-20453)
* Suppress CVE-2024-12801 (CASSANDRA-20412) * Suppress CVE-2024-12801 (CASSANDRA-20412)
* Suppress CVE-2024-12798 (CASSANDRA-20408) * Suppress CVE-2024-12798 (CASSANDRA-20408)
* Support null column value tombstones in FQL batch statements (CASSANDRA-20397) * Support null column value tombstones in FQL batch statements (CASSANDRA-20397)

2
ide/nbproject/project.xml
View File

File diff suppressed because one or more lines are too long