You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jl...@apache.org on 2022/11/09 16:26:21 UTC
[cassandra] branch trunk updated (0778ae362c -> d8e0991775)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 0778ae362c Merge branch 'cassandra-4.1' into trunk
add 9213335f59 Fix Splitter sometimes creating more splits than requested
add 67c530171c Merge branch 'cassandra-3.11' into cassandra-4.0
add e12dc48c87 Merge branch 'cassandra-4.0' into cassandra-4.1
new d8e0991775 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 +
src/java/org/apache/cassandra/dht/Splitter.java | 7 +++++++
.../org/apache/cassandra/dht/SplitterTest.java | 22 ++++++++++++++++++++++
3 files changed, 30 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 jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d8e0991775f8063c72c8ddc69282bf22a4789bcd
Merge: 0778ae362c e12dc48c87
Author: Jacek Lewandowski <le...@gmail.com>
AuthorDate: Wed Nov 9 17:22:35 2022 +0100
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/dht/Splitter.java | 7 +++++++
.../org/apache/cassandra/dht/SplitterTest.java | 22 ++++++++++++++++++++++
3 files changed, 30 insertions(+)
diff --cc CHANGES.txt
index 5683e3be5e,a9a1091c9d..de216c8688
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -134,8 -71,6 +134,9 @@@ Merged from 4.0
* Ensure FileStreamTask cannot compromise shared channel proxy for system table when interrupted (CASSANDRA-17663)
* silence benign SslClosedEngineException (CASSANDRA-17565)
Merged from 3.11:
++ * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013)
+ * Suppress CVE-2022-42003 and CVE-2022-42004 (CASSANDRA-17966)
+ * Make LongBufferPoolTest insensitive to timing (CASSANDRA-16681)
* Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840)
* Document usage of closed token intervals in manual compaction (CASSANDRA-17575)
* Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org