You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by be...@apache.org on 2020/04/07 23:36:02 UTC

[cassandra] branch cassandra-3.11 updated (ec21981 -> 912c6c4)

This is an automated email from the ASF dual-hosted git repository.

benedict pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from ec21981  Merge branch 'cassandra-3.0' into cassandra-3.11
     add e3f54d4  Memtable memory allocations may deadlock
     add 912c6c4  Merge branch 'cassandra-3.0' into cassandra-3.11

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt                                        |  3 ++
 src/java/org/apache/cassandra/db/Memtable.java     |  4 +-
 .../db/partitions/AtomicBTreePartition.java        | 49 +++++++++++-------
 .../apache/cassandra/utils/concurrent/OpOrder.java | 58 +++++++++++++---------
 .../cassandra/utils/memory/MemtableAllocator.java  |  5 ++
 .../apache/cassandra/index/CustomIndexTest.java    |  2 +-
 6 files changed, 77 insertions(+), 44 deletions(-)


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