This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2227057ac3dacba9bebd82d7cc3319c98d62cff4 Merge: 4acfd3b e6946e7 Author: Caleb Rackliffe <[email protected]> AuthorDate: Thu Jun 3 13:30:44 2021 -0500 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + .../cassandra/metrics/CassandraMetricsRegistry.java | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index c1d1669,d562f54..185ec72 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -4.0-rc2 +4.1 + * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651) +Merged from 4.0: + * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707) * Keep python driver in artifacts (CASSANDRA-16700) * Improve AuditLogging documentation and logback.xml(CASSANDRA-16682) * Spin up SEPWorker threads whenever we grow the number of work permits(CASSANDRA-16668) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
