You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2025/12/19 22:57:47 UTC

(cassandra) branch cassandra-5.0 updated (6fd83986e9 -> fc0ee48ea2)

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

mck pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from 6fd83986e9 Merge branch 'cassandra-4.1' into cassandra-5.0
     new 9e04193c3f 3.x cqlshlib tests broken on python2.7
     new 0293e8b750 Merge branch 'cassandra-3.0' into cassandra-3.11
     new 3c66c74a0f Merge branch 'cassandra-3.11' into cassandra-4.0
     new 99db2874ba Merge branch 'cassandra-4.0' into cassandra-4.1
     new fc0ee48ea2 Merge branch 'cassandra-4.1' into cassandra-5.0

The 5 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:
 pylib/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


---------------------------------------------------------------------
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.1' into cassandra-5.0

Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit fc0ee48ea2f12ffbbd2752a91e2ba1c259e1d812
Merge: 6fd83986e9 99db2874ba
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri Dec 19 23:43:43 2025 +0100

    Merge branch 'cassandra-4.1' into cassandra-5.0
    
    * cassandra-4.1:
      3.x cqlshlib tests broken on python2.7

 pylib/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc pylib/requirements.txt
index 19e4221b4f,f28412e59a..d084f18ad5
--- a/pylib/requirements.txt
+++ b/pylib/requirements.txt
@@@ -17,9 -17,8 +17,9 @@@
  #
  #
  
- -e git+https://github.com/datastax/python-driver.git@3.29.0#egg=cassandra-driver
 --e git+https://github.com/apache/cassandra-python-driver.git@3.25.0#egg=cassandra-driver
++-e git+https://github.com/apache/cassandra-python-driver.git@3.29.0#egg=cassandra-driver
  # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
- -e git+https://github.com/riptano/ccm.git@cassandra-test#egg=ccm
+ -e git+https://github.com/apache/cassandra-ccm.git@cassandra-test#egg=ccm
  coverage
  pytest
 +wcwidth


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