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 trunk

This commit is contained in:
Yifan Cai 2021-08-26 15:09:04 -07:00
parent 4ec4ab992f 42025fd73a
commit 1b5545beef
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

@ -19,6 +19,7 @@
* Add a system property to set hostId if not yet initialized (CASSANDRA-14582)
* GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
Merged from 4.0:
* Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
* Remove assumption that all urgent messages are small (CASSANDRA-16877)
* ArrayClustering.unsharedHeapSize does not include the data so undercounts the heap size (CASSANDRA-16845)
* Improve help, doc and error messages about sstabledump -k and -x arguments (CASSANDRA-16818)

2
build.xml
View File

@ -489,7 +489,7 @@
<dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.1.2.6"/>
<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.3.8-5"/>
<dependency groupId="com.github.luben" artifactId="zstd-jni" version="1.5.0-4"/>
<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" />