This is an automated email from the ASF dual-hosted git repository. jmckenzie pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 6f61257889 Merge branch 'cassandra-4.1' into trunk new 030831c5f5 Rename truncate_drop guardrail to drop_truncate_table new 2f1c785910 Merge branch 'cassandra-4.1' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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(-) rename test/unit/org/apache/cassandra/db/guardrails/{GuardrailTruncateDropTest.java => GuardrailDropTruncateTableTest.java} (87%) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org