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 3d022d3c5f2512e03c8c7fbc52de70afd058b2e7
Merge: b094303ac2 0c7410a9da
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Wed Oct 25 08:40:37 2023 +0200

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt                                        |   1 +
 .../cassandra/tools/nodetool/TableHistograms.java  |  23 +++-
 .../tools/nodetool/TableHistogramsTest.java        | 152 +++++++++++++++++++++
 3 files changed, 170 insertions(+), 6 deletions(-)

diff --cc CHANGES.txt
index 4c7d4ef721,517a20cdb8..763b8ecbbd
--- 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:
+  * Fix nodetool tablehistograms output to avoid printing repeated information 
and ensure at most two arguments (CASSANDRA-18955)
   * Change the checksum algorithm SAI-related files use from CRC32 to CRC32C 
(CASSANDRA-18836)
   * Correctly remove Index.Group from IndexRegistry (CASSANDRA-18905)
   * Fix vector type to support DDM's mask_default function (CASSANDRA-18889)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to