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 f41ca379dd1b832493c926a113a6ba311e31b727
Merge: 008c1b397b 3396ce9f08
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Wed Nov 29 12:14:55 2023 +0100

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt                                                          | 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java           | 1 -
 .../org/apache/cassandra/distributed/test/NativeProtocolTest.java    | 5 +++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --cc CHANGES.txt
index 06a4e36f18,09f3d96c06..30663dd45c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -57,8 -59,7 +57,9 @@@ Merged from 4.0
   * JMH improvements - faster build and async profiler (CASSANDRA-18871)
   * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844)
  Merged from 3.11:
 + * Revert CASSANDRA-18543 (CASSANDRA-18854)
  Merged from 3.0:
++ * Do not set RPC_READY to false on transports shutdown in order to not fail 
counter updates for deployments with coordinator and storage nodes with 
transports turned off (CASSANDRA-18935)
   * Suppress CVE-2023-44487 (CASSANDRA-18943)
   * Implement the logic in bin/stop-server (CASSANDRA-18838)
   * Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip 
(CASSANDRA-18935)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to