This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit cd3e564fb2e801466e6576d5acdbb3790c1f5313
Merge: 0d6d8a84d8 fb395c6b8b
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Aug 18 05:11:33 2023 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
.../org/apache/cassandra/tools/nodetool/stats/StatsTable.java | 1 +
.../apache/cassandra/tools/nodetool/stats/TableStatsHolder.java | 2 ++
.../apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java | 1 +
.../cassandra/tools/nodetool/stats/TableStatsPrinterTest.java | 8 ++++++++
.../apache/cassandra/tools/nodetool/stats/TableStatsTestBase.java | 1 +
6 files changed, 14 insertions(+)
diff --cc CHANGES.txt
index 221701a12d,90f8f99dfe..e7b058cfa2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -5,7 -3,9 +5,8 @@@ Merged from 4.0
* Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
* Migrate Python optparse to argparse (CASSANDRA-17914)
Merged from 3.11:
- * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
Merged from 3.0:
+ * Fix missing speculative retries in tablestats (CASSANDRA-18767)
* Fix Requires for Java for RPM package (CASSANDRA-18751)
* Fix CQLSH online help topic link (CASSANDRA-17534)
* Remove unused suppressions (CASSANDRA-18724)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
