(cassandra) branch trunk updated (1b7e895f56 -> 316a239c7c)

[ed...@apache.org]

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

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


    from 1b7e895f56 Merge branch 'cassandra-5.0' into trunk
     add 55fecfb65e Fix BulkLoaderTest.testBulkLoader_WithArgs2
     add 08d9b70b4d Merge branch 'cassandra-4.0' into cassandra-4.1
     add a2911c7391 Merge branch 'cassandra-4.1' into cassandra-5.0
     new 316a239c7c Merge branch 'cassandra-5.0' into trunk

The 1 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:
 test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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-5.0' into trunk

[ed...@apache.org]

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 316a239c7c71971de0d4c694bd59fa8540485a23
Merge: 1b7e895f56 a2911c7391
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Mon Nov 20 16:43:40 2023 -0500

    Merge branch 'cassandra-5.0' into trunk

 test/unit/org/apache/cassandra/tools/BulkLoaderTest.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


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