[cassandra] branch trunk updated (970ec2d1db -> c5bb672543)

[sm...@apache.org]

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

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


    from 970ec2d1db Merge branch 'cassandra-5.0' into trunk
     add 9f4368cbb7 Set io.netty.transport.noNative to false for in-jvm dtests
     new c5bb672543 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:
 src/java/org/apache/cassandra/config/CassandraRelevantProperties.java   | 1 +
 .../org/apache/cassandra/distributed/impl/AbstractCluster.java          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


---------------------------------------------------------------------
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

[sm...@apache.org]

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

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

commit c5bb6725438997c0591acb31879e7f7ae54b757b
Merge: 970ec2d1db 9f4368cbb7
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Fri Sep 22 14:05:25 2023 +0200

    Merge branch 'cassandra-5.0' into trunk

 src/java/org/apache/cassandra/config/CassandraRelevantProperties.java   | 1 +
 .../org/apache/cassandra/distributed/impl/AbstractCluster.java          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


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