This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 855dcad75b39dbe9a1db42c75274d1f81cc53c7e
Merge: 1e19a61 f4ab8cc
Author: Brandon Williams <[email protected]>
AuthorDate: Wed May 26 13:57:40 2021 -0500

    Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 1 +
 build.xml   | 5 +++++
 2 files changed, 6 insertions(+)

diff --cc CHANGES.txt
index b3e6853,90d5c08..f7927e5
--- 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:
+  * Keep python driver in artifacts (CASSANDRA-16700)
   * 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)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to