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

[cassandra] branch trunk updated (6f709ca0ec -> 5f3e60cfd4)

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

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


    from 6f709ca0ec Merge branch 'cassandra-4.1' into trunk
     add 2b31675fbd Fix running Ant rat targets without git
     add 761d9f9516 Merge branch 'cassandra-3.0' into cassandra-3.11
     add 8429229b7d Merge branch 'cassandra-3.11' into cassandra-4.0
     add 9c7d9a36ba Merge branch 'cassandra-4.0' into cassandra-4.1
     new 5f3e60cfd4 Merge branch 'cassandra-4.1' into trunk

The 1 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/build-rat.xml | 5 ++++-
 CHANGES.txt          | 1 +
 2 files changed, 5 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.1' into trunk

Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 5f3e60cfd44700aab4643366f99a251b4502e1b0
Merge: 6f709ca0ec 9c7d9a36ba
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Fri Oct 21 10:09:02 2022 +0200

    Merge branch 'cassandra-4.1' into trunk

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

diff --cc CHANGES.txt
index 288e8d2755,54e73d71e9..1dd8917f17
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -128,9 -71,6 +128,10 @@@ 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:
++ * Fix running Ant rat targets without git (CASSANDRA-17974)
 + * Harden JMX by resolving beanshooter issues (CASSANDRA-17921)
 + * 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