This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit aa644c9dfa6680c73a9400f295f450b623dee784
Merge: 03f0d37cb0 9f5e45e5a2
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Fri Jan 19 18:59:00 2024 -0500
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
bin/cassandra.in.sh | 8 ++++++++
conf/jvm17-clients.options | 4 ----
conf/jvm17-server.options | 3 ---
tools/bin/cassandra.in.sh | 8 ++++++++
5 files changed, 17 insertions(+), 7 deletions(-)
diff --cc CHANGES.txt
index 565b1d80b6,268bfa42b3..ebf48c2315
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
-5.0-beta2
+5.1
+ * Limit cassandra startup to supported JDKs, allow higher JDKs by setting
CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688)
+ * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104)
+ * Make nodetool tablestats use number of significant digits for time and
average values consistently (CASSANDRA-19015)
+ * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
+ * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330)
+ * 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:
+ * Append additional JVM options when using JDK17+ (CASSANDRA-19001)
* Upgrade Python driver to 3.29.0 (CASSANDRA-19245)
* Creating a SASI index after creating an SAI index does not break secondary
index queries (CASSANDRA-18939)
* Optionally fail when a non-partition-restricted query is issued against an
index (CASSANDRA-18796)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
