This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d7aaaa50013d1e275bc5836a48c64893e1365f43
Merge: 5f23e6d 26e21bb
Author: David Capwell <[email protected]>
AuthorDate: Wed Jun 23 13:11:27 2021 -0700

    Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 1 +
 build.xml   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 91963bd,2c69f48..4805c3a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,11 @@@
 -4.0.1
 +4.1
 + * Add isolated flush timer to CommitLogMetrics and ensure writes correspond 
to single WaitingOnCommit data points (CASSANDRA-16701)
 + * 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:
+  * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
   * 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]

Reply via email to