This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ce422e571b0db8b2cd8c332e233315b9aa266733 Merge: c9130d4 6c8f6bd Author: Mick Semb Wever <[email protected]> AuthorDate: Sun Jun 20 18:04:02 2021 +0200 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/diag/DiagnosticEventService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 6ca2995,d8c941a..7e6c22e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -4.0.1 +4.1 + * Add a system property to set hostId if not yet initialized (CASSANDRA-14582) + * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651) +Merged from 4.0: + * Improve DiagnosticEventService.publish(event) logging message of events (CASSANDRA-16749) + * Obfuscate passwords in statements in QueryEvents (CASSANDRA-16669) * Cleanup dependency scopes (CASSANDRA-16704) * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707) Merged from 3.0: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
