You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/11/30 13:34:52 UTC
[08/10] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfcd06dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfcd06dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfcd06dd
Branch: refs/heads/cassandra-3.X
Commit: dfcd06dda9383ca3a49a4ed1770b10673c63071c
Parents: 2ff97fe ea69be6
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Nov 30 14:31:16 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Nov 30 14:31:16 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 4 -
.../db/partitions/AtomicBTreePartition.java | 20 -----
.../apache/cassandra/utils/memory/HeapPool.java | 84 ++++++--------------
.../utils/memory/MemtableAllocator.java | 36 ---------
.../cassandra/utils/memory/NativeAllocator.java | 6 --
.../cassandra/utils/memory/SlabAllocator.java | 5 --
.../org/apache/cassandra/tools/ToolsTester.java | 2 +-
8 files changed, 26 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfcd06dd/CHANGES.txt
----------------------------------------------------------------------