You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2022/10/18 16:20:16 UTC

[cassandra] branch trunk updated (0ab2aa25d4 -> a62f618b08)

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

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


    from 0ab2aa25d4 Merge branch 'cassandra-4.1' into trunk
     new 3d4e6944ef Suppress CVE-2019-2684
     new 6b0cd7db04 Merge branch 'cassandra-3.0' into cassandra-3.11
     new a124f099e0 Merge branch 'cassandra-3.11' into cassandra-4.0
     new 0aa4ef1a8e Merge branch 'cassandra-4.0' into cassandra-4.1
     new a62f618b08 Merge branch 'cassandra-4.1' into trunk

The 5 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:
 .build/dependency-check-suppressions.xml | 1 +
 CHANGES.txt                              | 1 +
 2 files changed, 2 insertions(+)


---------------------------------------------------------------------
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 br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit a62f618b08fd2aa2f07b23a64e89bbe7165ea243
Merge: 0ab2aa25d4 0aa4ef1a8e
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Oct 18 11:19:38 2022 -0500

    Merge branch 'cassandra-4.1' into trunk

 .build/dependency-check-suppressions.xml | 1 +
 CHANGES.txt                              | 1 +
 2 files changed, 2 insertions(+)

diff --cc CHANGES.txt
index d32083e7eb,d5a1ce2416..96e3702566
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -124,7 -68,6 +124,8 @@@ Merged from 3.11
   * Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759)
   * Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907)
  Merged from 3.0:
++ * Suppress CVE-2019-2684 (CASSANDRA-17965)
 + * Fix auto-completing "WITH" when creating a materialized view (CASSANDRA-17879)
   * Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767)
   * Fix restarting of services on gossipping-only member (CASSANDRA-17752)
   * Fix scrubber falling into infinite loop when the last partition is broken (CASSANDRA-17862)


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