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 2023/03/13 09:08:09 UTC

[cassandra] branch trunk updated (6eeb61d504 -> 3eff9e755c)

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 6eeb61d504 Merge branch 'cassandra-4.1' into trunk
     add 3cfb222122 Fix BufferPool.memoryInUse counter
     add 8ba3888fcf Merge branch 'cassandra-4.0' into cassandra-4.1
     new 3eff9e755c 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/utils/memory/BufferPool.java  |  6 ++--
 .../cassandra/utils/memory/BufferPoolTest.java     | 32 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 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 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 3eff9e755c46ca1e0011f2c91f8cb48e48cec025
Merge: 6eeb61d504 8ba3888fcf
Author: Jacek Lewandowski <le...@gmail.com>
AuthorDate: Mon Mar 13 09:57:48 2023 +0100

    Merge branch 'cassandra-4.1' into trunk

 CHANGES.txt                                        |  1 +
 .../apache/cassandra/utils/memory/BufferPool.java  |  6 ++--
 .../cassandra/utils/memory/BufferPoolTest.java     | 32 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)



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