You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2022/10/06 14:44:05 UTC
[cassandra] branch trunk updated (ace5662143 -> ba1a3fb8ae)
This is an automated email from the ASF dual-hosted git repository.
aleksey pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from ace5662143 Merge branch 'cassandra-4.1' into trunk
add dc2acba043 Make LongBufferPoolTest insensitive to timing
add 4e1d31e729 Merge branch 'cassandra-3.11' into cassandra-4.0
add 0b083d3e73 Merge branch 'cassandra-4.0' into cassandra-4.1
new ba1a3fb8ae 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 | 2 +
.../apache/cassandra/utils/memory/BufferPool.java | 24 +++
.../cassandra/utils/memory/LongBufferPoolTest.java | 219 +++++++++++++++------
.../cassandra/utils/memory/BufferPoolTest.java | 31 +++
4 files changed, 219 insertions(+), 57 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 al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aleksey pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ba1a3fb8ae92f51965d4771738d55a2163490c70
Merge: ace5662143 0b083d3e73
Author: Aleksey Yeschenko <al...@apache.org>
AuthorDate: Thu Oct 6 15:36:57 2022 +0100
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 2 +
.../apache/cassandra/utils/memory/BufferPool.java | 24 +++
.../cassandra/utils/memory/LongBufferPoolTest.java | 219 +++++++++++++++------
.../cassandra/utils/memory/BufferPoolTest.java | 31 +++
4 files changed, 219 insertions(+), 57 deletions(-)
diff --cc CHANGES.txt
index 72e7720b73,d52a47dca7..b9006d8904
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -111,6 -59,6 +111,7 @@@ Merged from 4.0
* Avoid getting hanging repairs due to repair message timeouts (CASSANDRA-17613)
* Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834)
Merged from 3.11:
++ * Make LongBufferPoolTest insensitive to timing (CASSANDRA-16681)
* Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907)
* Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840)
Merged from 3.0:
@@@ -118,6 -65,6 +119,7 @@@
* Fix scrubber falling into infinite loop when the last partition is broken (CASSANDRA-17862)
* Fix resetting schema (CASSANDRA-17819)
++
4.0.6
* Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834)
* Fix race condition on updating cdc size and advancing to next segment (CASSANDRA-17792)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org