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

Merge branch 'cassandra-6.0' into trunk

This commit is contained in:
Stefan Miklosovic 2026-07-10 11:16:12 +02:00
parent 4ddbe3f72b 2397d52df7
commit e56b58732c
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
4 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.build/cassandra-deps-maven-pom.xml
View File

@ -311,6 +311,22 @@
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<classifier>linux_amd64</classifier>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<classifier>linux_aarch64</classifier>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<classifier>darwin_x86_64</classifier>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<classifier>darwin_aarch64</classifier>
</dependency>
<dependency>
<groupId>org.psjava</groupId>

19
.build/parent-maven-pom.xml
View File

@ -304,6 +304,25 @@
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.7-2</version>
<classifier>linux_aarch64</classifier>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.7-2</version>
<classifier>linux_amd64</classifier>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.7-2</version>
<classifier>darwin_aarch64</classifier>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.7-2</version>
<classifier>darwin_x86_64</classifier>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>

1
CHANGES.txt
View File

@ -4,6 +4,7 @@
* Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767)
* Add a guardrail for misprepared statements (CASSANDRA-21139)
Merged from 6.0:
* Depend only on platform-specific Zstd JNI native libraries (CASSANDRA-21483)
* Expose immediately-executed tasks in the queries virtual table (CASSANDRA-21471)
* Avoid potential deadlock between GlobalLogFollower and GossipStage (CASSANDRA-21384)
* Add CMS membership as a field in ClusterMetadata (CASSANDRA-20736)

2
ide/nbproject/project.xml
View File

File diff suppressed because one or more lines are too long