This is an automated email from the ASF dual-hosted git repository.
jmckenzie pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2f1c7859106031a608394aeb2f9e6d565510b481
Merge: 6f61257889 030831c5f5
Author: Josh McKenzie <jmcken...@apache.org>
AuthorDate: Fri May 6 11:50:48 2022 -0400
Merge branch 'cassandra-4.1' into trunk
# Conflicts:
# CHANGES.txt
CHANGES.txt | 2 ++
NEWS.txt | 1 +
conf/cassandra.yaml | 4 ++--
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/config/GuardrailsOptions.java | 12 ++++++------
.../cassandra/cql3/statements/TruncateStatement.java | 2 +-
.../cql3/statements/schema/DropTableStatement.java | 2 +-
.../org/apache/cassandra/db/guardrails/Guardrails.java | 16 ++++++++--------
.../apache/cassandra/db/guardrails/GuardrailsConfig.java | 2 +-
.../apache/cassandra/db/guardrails/GuardrailsMBean.java | 4 ++--
...DropTest.java => GuardrailDropTruncateTableTest.java} | 10 +++++-----
11 files changed, 30 insertions(+), 27 deletions(-)
diff --cc CHANGES.txt
index 8b6f7fd1d2,efc1a2fbf1..d39b8cbc31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,13 @@@
+4.2
+Merged from 4.1:
+Merged from 4.0:
+Merged from 3.11:
+Merged from 3.0:
+
+
4.1
+ * Rename truncate_drop guardrail to drop_truncate_table (CASSANDRA-17592)
+ * nodetool enablefullquerylog can NPE when directory has no files
(CASSANDRA-17595)
* Add auto_snapshot_ttl configuration (CASSANDRA-16790)
* List snapshots of dropped tables (CASSANDRA-16843)
* Add information whether sstables are dropped to SchemaChangeListener
(CASSANDRA-17582)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
