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 2feeb39d5a223da3b46805ce656844c44fb9a8cc Merge: 3d15be1d5e a4fc03e799 Author: Stefan Miklosovic <[email protected]> AuthorDate: Wed Oct 18 12:57:21 2023 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + bin/stop-server | 65 ++++++++++++++++++++++++++++++++++------- redhat/cassandra.spec | 2 +- redhat/noboolean/cassandra.spec | 2 +- 4 files changed, 57 insertions(+), 13 deletions(-) diff --cc CHANGES.txt index 0e92350f19,9377b7a421..47703336da --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -30,8 -25,8 +30,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) ++ * 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]
