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

Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Stefan Miklosovic 2023-10-09 21:44:07 +02:00
parent 865d7c30e4 4549b07997
commit e63d3bfc4b
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.build/cassandra-deps-template.xml
View File

@ -136,10 +136,6 @@
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-logback</artifactId> <artifactId>metrics-logback</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.addthis.metrics</groupId>
<artifactId>reporter-config3</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.clearspring.analytics</groupId> <groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId> <artifactId>stream</artifactId>

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

@ -712,17 +712,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.addthis.metrics</groupId>
<artifactId>reporter-config3</artifactId>
<version>3.0.3</version>
<exclusions>
<exclusion>
<artifactId>hibernate-validator</artifactId>
<groupId>org.hibernate</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.mindrot</groupId> <groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId> <artifactId>jbcrypt</artifactId>

1
CHANGES.txt
View File

@ -3,6 +3,7 @@
* Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
* Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
Merged from 5.0: Merged from 5.0:
* Remove unnecessary reporter-config3 dependency (CASSANDRA-18907)
* Remove support for empty values on the vector data type (CASSANDRA-18876) * Remove support for empty values on the vector data type (CASSANDRA-18876)
* Upgrade Dropwizard Metrics to 4.2.19 (CASSANDRA-14667) * Upgrade Dropwizard Metrics to 4.2.19 (CASSANDRA-14667)
* Upgrade caffeine cache and fix CIDR permissions cache invalidation (CASSANDRA-18805) * Upgrade caffeine cache and fix CIDR permissions cache invalidation (CASSANDRA-18805)