You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/05/26 18:58:02 UTC

[cassandra] branch trunk updated (1e19a61 -> 855dcad)

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

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


    from 1e19a61  Merge branch 'cassandra-4.0' into trunk
     new f4ab8cc  Keep python driver in artifacts.
     new 855dcad  Merge branch 'cassandra-4.0' 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 | 1 +
 build.xml   | 5 +++++
 2 files changed, 6 insertions(+)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

Posted by br...@apache.org.
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 <br...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org