Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Ekaterina Dimitrova 2023-08-09 10:00:27 -04:00
commit d707bb98b4
2 changed files with 3 additions and 2 deletions

View File

@ -660,13 +660,13 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>1.21</version>
<version>1.36</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>1.21</version>
<version>1.36</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@ -1,5 +1,6 @@
5.1
Merged from 5.0:
* Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696)
* Add guardrail for vector dimensions (CASSANDRA-18730)
Merged from 4.1:
Merged from 4.0: