This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6a3bcc83d2c4472ed14a7b8ec7766edbd5914eda
Merge: a77951ec0c fb806d51e3
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Tue Nov 14 21:43:29 2023 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 15 +
pylib/cqlshlib/cqlhandling.py | 3 +-
pylib/cqlshlib/test/test_cqlsh_completion.py | 13 +-
.../config/CassandraRelevantProperties.java | 2 +
.../db/compaction/UnifiedCompactionStrategy.md | 84 +-
.../db/compaction/unified/Controller.java | 234 +-
.../compaction/unified/shards_graph_lambda_0.svg | 2180 +++++++++++++++++++
.../unified/shards_graph_lambda_0_33.svg | 2203 +++++++++++++++++++
.../compaction/unified/shards_graph_lambda_0_5.svg | 2238 ++++++++++++++++++++
.../compaction/unified/shards_graph_lambda_1.svg | 1943 +++++++++++++++++
.../org/apache/cassandra/utils/FBUtilities.java | 16 +
.../test/UnifiedCompactionDensitiesTest.java | 5 +-
.../db/compaction/unified/ControllerTest.java | 254 ++-
14 files changed, 9134 insertions(+), 57 deletions(-)
diff --cc CHANGES.txt
index bfa639fff2,39553a3854..ccbc570258
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-5.0-beta1
+5.1
+ * Add ELAPSED command to cqlsh (CASSANDRA-18861)
+ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh
(CASSANDRA-18787)
+Merged from 5.0:
+ * Add UCS sstable_growth and min_sstable_size options (CASSANDRA-18945)
* Make cqlsh's min required Python version 3.7+ instead of 3.6+
(CASSANDRA-18960)
* Fix incorrect seeking through the sstable iterator by IndexState
(CASSANDRA-18932)
* Upgrade Python driver to 3.28.0 (CASSANDRA-18960)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
