You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/06/20 16:11:40 UTC

[cassandra] branch trunk updated (c9130d4 -> ce422e5)

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

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


    from c9130d4  Merge branch cassandra-4.0 into trunk
     new 6c8f6bd  DiagnosticEventService.publish was logging logs events without an overridden toString, fixed to use toMap() in logs
     new ce422e5  Merge branch 'cassandra-4.0' into trunk

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/diag/DiagnosticEventService.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk

Posted by mc...@apache.org.
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 <mc...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org