This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f36fd33e33ff88e07fdb5e3c5df7385d3fa8d688
Merge: 2dc1639d4f 72fc04d238
Author: Marcus Eriksson <marc...@apache.org>
AuthorDate: Thu May 25 08:43:27 2023 +0200
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
conf/cassandra.yaml | 2 ++
.../cassandra/config/DatabaseDescriptor.java | 5 ++++
.../apache/cassandra/service/StorageService.java | 8 +++++-
.../cassandra/tools/nodetool/EnableAuditLog.java | 4 ++-
.../tools/nodetool/EnableFullQueryLog.java | 3 ++-
.../cassandra/utils/binlog/BinLogOptions.java | 7 ++++++
.../apache/cassandra/audit/AuditLoggerTest.java | 29 ++++++++++++++++++++++
.../apache/cassandra/fql/FullQueryLoggerTest.java | 27 ++++++++++++++++++++
9 files changed, 83 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
