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 a1de444331f94f34ceb653f7881e31a00d7511f7
Merge: 210a59b194 f51d9ecbe3
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Wed Oct 4 13:53:04 2023 +0200
Merge branch 'cassandra-5.0' into trunk
.build/parent-pom-template.xml | 34 ++++++++++++++++++----
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 ++--
.../cassandra/tools/nodetool/ClientStatsTest.java | 6 ++--
4 files changed, 34 insertions(+), 12 deletions(-)
diff --cc CHANGES.txt
index ed3690e986,bca22c4580..1870ba0ac2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-5.0-alpha2
+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:
+ * Upgrade Dropwizard Metrics to 4.2.19 (CASSANDRA-14667)
* Upgrade caffeine cache and fix CIDR permissions cache invalidation
(CASSANDRA-18805)
* Remove deprecated properties in CompressionParams (CASSANDRA-18742)
* Add support for repair coordinator to retry messages that timeout
(CASSANDRA-18816)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
