This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0541e5b078a2fe6cb0199e72f1a735a6f565ef08
Merge: 6c20fbca4a 559b17f71d
Author: David Capwell <dcapw...@apache.org>
AuthorDate: Wed May 4 09:32:42 2022 -0700
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/utils/binlog/BinLog.java | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index dc7f81eec7,131b0c980d..4e1d7da018
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,12 @@@
-4.1
+4.2
++Merged from 4.1:
+ * nodetool enablefullquerylog can NPE when directory has no files
(CASSANDRA-17595)
+Merged from 4.0:
+Merged from 3.11:
+Merged from 3.0:
+
+
+4.1
* 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
