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 b094303ac23c2d6df6e692b1eb2272ef76c3c0f5 Merge: afde441448 9ffb838d03 Author: Stefan Miklosovic <[email protected]> AuthorDate: Tue Oct 24 16:32:54 2023 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../apache/cassandra/service/CassandraDaemon.java | 14 +++++++++--- .../distributed/test/NativeProtocolTest.java | 26 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 7b4ea53fc4,791d7e110a..4c7d4ef721 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -32,8 -28,9 +32,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: - * Implement the logic in bin/stop-server (CASSANDRA-18838) + * Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935) * Implement the logic in bin/stop-server (CASSANDRA-18838) * Upgrade snappy-java to 1.1.10.4 (CASSANDRA-18878) * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
