You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/25 03:51:40 UTC
[9/9] git commit: merge from 2.0
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a9120bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a9120bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a9120bb
Branch: refs/heads/trunk
Commit: 3a9120bbd9318b9cc8c647920bfb0d348fcf104c
Parents: 2fea9fa a06a138
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 20:51:26 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 20:51:26 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 4 +---
src/java/org/apache/cassandra/utils/Allocator.java | 2 --
src/java/org/apache/cassandra/utils/HeapAllocator.java | 5 -----
src/java/org/apache/cassandra/utils/SlabAllocator.java | 8 --------
5 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a9120bb/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a9120bb/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------