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 555dec50c21a0bed871e186de1429fb5efa8f817 Merge: 64f553bf97 aa84b19112 Author: Stefan Miklosovic <[email protected]> AuthorDate: Thu Aug 17 11:25:16 2023 +0200 Merge branch 'cassandra-5.0' into trunk .build/build-resolver.xml | 3 + .build/cassandra-deps-template.xml | 21 +++--- .build/parent-pom-template.xml | 87 +++++++++++++++++++--- CHANGES.txt | 1 + .../org/apache/cassandra/utils/SigarLibrary.java | 1 + .../distributed/impl/AbstractCluster.java | 1 + 6 files changed, 92 insertions(+), 22 deletions(-) diff --cc CHANGES.txt index 381bb4a227,adf6371512..dac7b11581 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -5.0-alpha1 +5.1 +Merged from 5.0: + * Remove unnecessary Netty dependencies after upgrade to version 4.1.96 (CASSANDRA-18729) * Prevent InaccessibleObjectException when the Leak Detector is traversing objects (CASSANDRA-18708) * Remove legacy command line options from cassandra-stress (CASSANDRA-18529) * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
