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 2dc1639d4fb689d65b1ffd660547b8e649b6d495 Merge: 61333964f4 93efe0ee04 Author: Brandon Williams <[email protected]> AuthorDate: Wed May 24 09:39:26 2023 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 2 ++ .../cassandra/metrics/BufferPoolMetrics.java | 5 +++ src/java/org/apache/cassandra/tools/NodeProbe.java | 38 ++++++++++++++++++++-- .../org/apache/cassandra/tools/nodetool/Info.java | 16 +++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index 12741fad68,0f46880950..f4e006751f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -149,8 -6,11 +149,10 @@@ Merged from 4.0 * Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353) * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354) Merged from 4.0: + * Report network cache info in nodetool (CASSANDRa-18400) + * Partial compaction can resurrect deleted data (CASSANDRA-18507) * Allow internal address to change with reconnecting snitches (CASSANDRA-16718) * Fix quoting in toCqlString methods of UDTs and aggregates (CASSANDRA-17918) - * NPE when deserializing malformed collections from client (CASSANDRA-18505) * Improve 'Not enough space for compaction' logging messages (CASSANDRA-18260) * Incremental repairs fail on mixed IPv4/v6 addresses serializing SyncRequest (CASSANDRA-18474) * Deadlock updating sstable metadata if disk boundaries need reloading (CASSANDRA-18443) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
