Skip to content

Commit cc63d3c

Browse files
committed
Merge branch 'cassandra-5.0' into trunk
2 parents 4d29990 + 4f382d9 commit cc63d3c

File tree

4 files changed

+126
-2
lines changed

4 files changed

+126
-2
lines changed

.build/parent-pom-template.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
<dependency>
303303
<groupId>com.github.luben</groupId>
304304
<artifactId>zstd-jni</artifactId>
305-
<version>1.5.5-1</version>
305+
<version>1.5.7-1</version>
306306
</dependency>
307307
<dependency>
308308
<groupId>com.google.guava</groupId>

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ Merged from 4.1:
192192
* Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
193193
* Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
194194
Merged from 4.0:
195+
* Update Zstd library to 1.5.7-1 (CASSANDRA-20367)
196+
* Fix premature auto-failing of long-running repairs (CASSANDRA-20312)
195197
* Fix autocompletion for role names/user names (CASSANDRA-20175)
196198
* Tighten up permissions in dc and cidr authorizers (CASSANDRA-20225)
197199
* CBUtil serialization of UTF8 does not handle all UTF8 properly (CASSANDRA-20234)

0 commit comments

Comments
 (0)