(cassandra) branch trunk updated (cbabfd39b1 -> 5f2ff4f932)

[if...@apache.org]

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

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


    from cbabfd39b1 Merge branch 'cassandra-5.0' into trunk
     add f46444b628 Remove relocated.shadedad.io.netty.transport.noNative prop
     new 5f2ff4f932 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/fuzz/HarryHelper.java            | 4 ++--
 2 files changed, 2 insertions(+), 3 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

[if...@apache.org]

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

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

commit 5f2ff4f932c5a810e1fb4f6266d4ca76a9899c56
Merge: cbabfd39b1 f46444b628
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Thu Nov 30 12:43:49 2023 +0100

    Merge branch 'cassandra-5.0' into trunk

 src/java/org/apache/cassandra/config/CassandraRelevantProperties.java | 1 -
 .../org/apache/cassandra/distributed/fuzz/HarryHelper.java            | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)



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