diff --git a/CHANGES.txt b/CHANGES.txt index 7aef38b6bb..dcc5caf317 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.13 + * Upgrade slf4j to 1.7.25 (CASSANDRA-17474) * Upgrade jackson to 2.13.2 (CASSANDRA-17492) * emit warning on keyspace creation when replication factor is bigger than the number of nodes (CASSANDRA-16747) * Fix snapshot true size calculation (CASSANDRA-17267) diff --git a/build.xml b/build.xml index 0081556270..5948eca37f 100644 --- a/build.xml +++ b/build.xml @@ -357,9 +357,9 @@ - - - + + + diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 763b1d71eb..bac46eb30f 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -1922,7 +1922,7 @@ public class StorageProxy implements StorageProxyMBean } catch (DigestMismatchException ex) { - Tracing.trace("Digest mismatch: {}", ex); + Tracing.trace("Digest mismatch: {}", ex.toString()); ReadRepairMetrics.repairedBlocking.mark(); diff --git a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java index 702fa986d6..fe5d58e7e6 100644 --- a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java +++ b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java @@ -39,7 +39,7 @@ public class NoSpamLoggerTest { Map>> logged = new HashMap<>(); - Logger mock = new SubstituteLogger(null) + Logger mock = new SubstituteLogger(null, null, true) { @Override