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.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2023-04-06 23:29:22 +02:00
parent 3c2df9f1bd 03be6d7926
commit a8fa357bbc
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

1
CHANGES.txt
View File

@ -5,6 +5,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:

2
build.xml
View File

@ -518,7 +518,7 @@
<dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.1.8.4"/>
<dependency groupId="org.lz4" artifactId="lz4-java" version="1.8.0"/>
<dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4" scope="provided"/>
<dependency groupId="com.github.luben" artifactId="zstd-jni" version="1.5.4-1"/>
<dependency groupId="com.github.luben" artifactId="zstd-jni" version="1.5.5-1"/>
<dependency groupId="com.google.guava" artifactId="guava" version="27.0-jre">
<exclusion groupId="com.google.code.findbugs" artifactId="jsr305" />
<exclusion groupId="org.codehaus.mojo" artifactId="animal-sniffer-annotations" />