Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbdeef83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbdeef83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbdeef83 Branch: refs/heads/trunk Commit: fbdeef836ae8f88bb0e0a7081c512629caf61c1d Parents: 9c9e392 79f230f Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Nov 2 18:59:35 2015 +0000 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Nov 2 18:59:35 2015 +0000 ---------------------------------------------------------------------- .../cassandra/utils/btree/NodeBuilder.java | 11 +- .../cassandra/utils/btree/TreeBuilder.java | 2 +- .../cassandra/utils/memory/MemoryUtil.java | 2 +- .../org/apache/cassandra/db/NativeCellTest.java | 280 +++++++++++++++++++ 4 files changed, 288 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
