This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d5e8e81993311076b7c9759e864429fc500fe9c6 Merge: dfc3dbc d727072 Author: Brandon Williams <[email protected]> AuthorDate: Thu Jul 1 14:27:34 2021 -0500 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + .../tools/nodetool/stats/TableStatsHolder.java | 14 ++++++++++++++ .../tools/nodetool/stats/TableStatsPrinter.java | 6 ++++++ .../tools/nodetool/stats/TableStatsPrinterTest.java | 18 ++++++++++++++++++ 4 files changed, 39 insertions(+) diff --cc CHANGES.txt index bef29da,aa95028..dcfacb4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,12 @@@ -4.0.1 +4.1 + * Add isolated flush timer to CommitLogMetrics and ensure writes correspond to single WaitingOnCommit data points (CASSANDRA-16701) + * Add a system property to set hostId if not yet initialized (CASSANDRA-14582) + * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651) +Merged from 4.0: + * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282) * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753) * Improve DiagnosticEventService.publish(event) logging message of events (CASSANDRA-16749) + * Obfuscate passwords in statements in QueryEvents (CASSANDRA-16669) * Cleanup dependency scopes (CASSANDRA-16704) * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707) Merged from 3.11: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
