Skip to content

Commit 0679fea

Browse files
committed
Merge branch 'cassandra-5.0' into trunk
This merge contains the forgotten entry in 6.0-alpha1 list of changes in CHANGES.txt for CASSANDRA-21007
2 parents 1a9ab95 + 03dc5a0 commit 0679fea

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@
310310
* Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
311311
* Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
312312
Merged from 5.0:
313+
* Update cassandra-stress to support TLS 1.3 by default by auto-negotiation (CASSANDRA-21007)
313314
* Refactor SAI ANN query execution to use score ordered iterators for correctness and speed (CASSANDRA-20086)
314315
* Fix ConcurrentModificationException in compaction garbagecollect (CASSANDRA-21065)
315316
* Dynamically skip sharding L0 when SAI Vector index present (CASSANDRA-19661)

0 commit comments

Comments
 (0)