cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Wed, 30 Nov 2016 13:34:54 GMT
Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee7f3c3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee7f3c3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee7f3c3b

Branch: refs/heads/trunk
Commit: ee7f3c3b530870c7011fc57f06bcade76c2ef9c7
Parents: cba3c01 dfcd06d
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Nov 30 14:32:08 2016 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Nov 30 14:32:08 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/ee7f3c3b/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee7f3c3b/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------


Mime
View raw message