This is an automated email from the ASF dual-hosted git repository.
benedict pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from d069fd2 Fix cqlsh erroring out on Python 3.7 due to webbrowser module
being absent
add e3f54d4 Memtable memory allocations may deadlock
add 912c6c4 Merge branch 'cassandra-3.0' into cassandra-3.11
new 6f21372 Merge branch 'cassandra-3.11' 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 | 3 ++
src/java/org/apache/cassandra/db/Memtable.java | 4 +-
.../db/partitions/AtomicBTreePartition.java | 39 ++++++++++++---
.../apache/cassandra/utils/concurrent/OpOrder.java | 58 +++++++++++++---------
.../cassandra/utils/memory/MemtableAllocator.java | 5 ++
.../apache/cassandra/index/CustomIndexTest.java | 2 +-
6 files changed, 76 insertions(+), 35 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
