You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2022/05/04 16:35:36 UTC

[cassandra] branch trunk updated (6c20fbca4a -> 0541e5b078)

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

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


    from 6c20fbca4a Merge branch 'cassandra-4.1' into trunk
     new 559b17f71d nodetool enablefullquerylog can NPE when directory has no files
     new 0541e5b078 Merge branch 'cassandra-4.1' 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                                            | 2 ++
 src/java/org/apache/cassandra/utils/binlog/BinLog.java | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)


---------------------------------------------------------------------
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.1' into trunk

Posted by dc...@apache.org.
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 0541e5b078a2fe6cb0199e72f1a735a6f565ef08
Merge: 6c20fbca4a 559b17f71d
Author: David Capwell <dc...@apache.org>
AuthorDate: Wed May 4 09:32:42 2022 -0700

    Merge branch 'cassandra-4.1' into trunk

 CHANGES.txt                                            | 2 ++
 src/java/org/apache/cassandra/utils/binlog/BinLog.java | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index dc7f81eec7,131b0c980d..4e1d7da018
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,12 @@@
 -4.1
 +4.2
++Merged from 4.1:
+  * nodetool enablefullquerylog can NPE when directory has no files (CASSANDRA-17595)
 +Merged from 4.0:
 +Merged from 3.11:
 +Merged from 3.0:
 +
 +
 +4.1
   * Add auto_snapshot_ttl configuration (CASSANDRA-16790)
   * List snapshots of dropped tables (CASSANDRA-16843)
   * Add information whether sstables are dropped to SchemaChangeListener (CASSANDRA-17582)


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