You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yc...@apache.org on 2022/12/06 03:01:40 UTC
[cassandra] branch trunk updated (33c60d8daf -> 235d2df0ee)
This is an automated email from the ASF dual-hosted git repository.
ycai pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 33c60d8daf Merge branch 'cassandra-4.1' into trunk
add 473656c1d5 Fix incorrect resource name in LIST PERMISSION output
add eb91e2c354 Merge branch 'cassandra-3.0' into cassandra-3.11
add f22263cd8a Merge branch 'cassandra-3.11' into cassandra-4.0
add 27fff06bb7 Merge branch 'cassandra-4.0' into cassandra-4.1
new 235d2df0ee 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:
CHANGES.txt | 1 +
.../apache/cassandra/auth/FunctionResource.java | 25 +++++++++++++---
.../cassandra/cql3/functions/FunctionName.java | 26 +++++++++++++++++
.../schema/CreateAggregateStatement.java | 3 ++
.../statements/schema/CreateFunctionStatement.java | 3 ++
.../cassandra/auth/FunctionResourceTest.java | 33 ++++++++++++++--------
.../cassandra/cql3/validation/entities/UFTest.java | 23 ++++++++++++++-
.../validation/operations/AggregationTest.java | 17 +++++++++++
8 files changed, 115 insertions(+), 16 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 yc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 235d2df0eea4a2c70bbdcb1b9f4d2e121080f4c3
Merge: 33c60d8daf 27fff06bb7
Author: Yifan Cai <yc...@apache.org>
AuthorDate: Mon Dec 5 18:57:19 2022 -0800
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/auth/FunctionResource.java | 25 +++++++++++++---
.../cassandra/cql3/functions/FunctionName.java | 26 +++++++++++++++++
.../schema/CreateAggregateStatement.java | 3 ++
.../statements/schema/CreateFunctionStatement.java | 3 ++
.../cassandra/auth/FunctionResourceTest.java | 33 ++++++++++++++--------
.../cassandra/cql3/validation/entities/UFTest.java | 23 ++++++++++++++-
.../validation/operations/AggregationTest.java | 17 +++++++++++
8 files changed, 115 insertions(+), 16 deletions(-)
diff --cc CHANGES.txt
index 79590ddad6,a36662ba48..68a73159cc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -158,11 -88,6 +158,12 @@@ 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 incorrect resource name in LIST PERMISSION output (CASSANDRA-17848)
+ * Suppress CVE-2022-41854 and similar (CASSANDRA-18083)
+ * 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