This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9f5886a4b8894c733e53c34457adae82034f9380
Merge: 1112cdf 658f3e1
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Fri May 21 14:44:41 2021 -0400
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
conf/logback.xml | 23 ++++
doc/source/new/auditlogging.rst | 47 +++++++
doc/source/operating/audit_logging.rst | 236 ---------------------------------
4 files changed, 71 insertions(+), 236 deletions(-)
diff --cc CHANGES.txt
index a739bd6,e84e3fe..b7690db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-4.0-rc2
+4.1
+ * GossiperTest.testHasVersion3Nodes didn't take into account trunk version
changes, fixed to rely on latest version (CASSANDRA-16651)
+Merged from 4.0:
+ * Improve AuditLogging documentation and logback.xml(CASSANDRA-16682)
* Spin up SEPWorker threads whenever we grow the number of work
permits(CASSANDRA-16668)
* Add a warning to cqlsh 6.0.0 that DESCRIBE does not work with a Cassandra
3.x servers (CASSANDRA-16652)
* cqlsh: fix DESC TYPE with non-ascii character in the identifier
(CASSANDRA-16400)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
