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

Merge branch 'cassandra-4.1' into trunk

This commit is contained in:
Stefan Miklosovic 2023-04-06 23:39:41 +02:00
parent c387462485 a8fa357bbc
commit 6a1a4d8459
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,7 @@
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.4-1</version>
<version>1.5.5-1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>

1
CHANGES.txt
View File

@ -133,6 +133,7 @@
* Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
* Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
Merged from 4.0:
* Update zstd-jni library to version 1.5.5 (CASSANDRA-18429)
Merged from 3.11:
* Suppress CVE-2022-45688 (CASSANDRA-18389)
Merged from 3.0: