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 2023/08/18 15:42:13 UTC

[cassandra] branch cassandra-4.0 updated (ba50ec9cd9 -> ed4e6c4e21)

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

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


    from ba50ec9cd9 Merge branch 'cassandra-3.11' into cassandra-4.0
     new ade85693d5 gitignore serverversion.py
     new d173f57558 Merge branch 'cassandra-3.0' into cassandra-3.11
     new ed4e6c4e21 Merge branch 'cassandra-3.11' into cassandra-4.0

The 3 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:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)


---------------------------------------------------------------------
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-3.11' into cassandra-4.0

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

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

commit ed4e6c4e211354771f5f9f58f554723de95caf21
Merge: ba50ec9cd9 d173f57558
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Aug 18 10:41:16 2023 -0500

    Merge branch 'cassandra-3.11' into cassandra-4.0

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --cc .gitignore
index 318f2006db,bf4213f97f..72d8b93167
--- a/.gitignore
+++ b/.gitignore
@@@ -11,9 -10,9 +11,10 @@@ data
  conf/hotspot_compiler
  doc/cql3/CQL.html
  doc/build/
 +lib/
  pylib/src/
+ pylib/cqlshlib/serverversion.py
 -lib/
 +!lib/cassandra-driver-internal-only-*.zip
  
  # C* debs
  build-stamp


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