This is an automated email from the ASF dual-hosted git repository.

samt pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7ffb2fe53e9665ed7f626573dbd7da530a212bdb
Merge: fc9a5a7 068d87a
Author: Sam Tunnicliffe <[email protected]>
AuthorDate: Mon Nov 23 15:31:14 2020 +0000

    Merge branch 'cassandra-3.0' into cassandra-3.11

 CHANGES.txt                                                      | 1 +
 src/java/org/apache/cassandra/utils/JVMStabilityInspector.java   | 2 +-
 .../org/apache/cassandra/utils/JVMStabilityInspectorTest.java    | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 7e54961,546fd98..dd554c2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.24:
 +3.11.10
 + * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 + * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.0:
+  * Avoid potential NPE in JVMStabilityInspector (CASSANDRA-16294)
   * Improved check of num_tokens against the length of initial_token 
(CASSANDRA-14477)
   * Fix a race condition on ColumnFamilyStore and TableMetrics 
(CASSANDRA-16228)
   * Remove the SEPExecutor blocking behavior (CASSANDRA-16186)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to