Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/utils/btree/NodeBuilder.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82aa7969
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82aa7969
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82aa7969
Branch: refs/heads/trunk
Commit: 82aa7969c1b77967ef2e6ab847cb5c11cc4c002c
Parents: 0fbf715 986a1a7
Author: Benedict Elliott Smith <bened...@apache.org>
Authored: Mon Nov 2 18:57:37 2015 +0000
Committer: Benedict Elliott Smith <bened...@apache.org>
Committed: Mon Nov 2 18:57:37 2015 +0000
----------------------------------------------------------------------
.../apache/cassandra/utils/btree/Builder.java | 2 +-
.../cassandra/utils/btree/NodeBuilder.java | 11 +++----
.../cassandra/utils/memory/MemoryUtil.java | 2 +-
.../org/apache/cassandra/db/NativeCellTest.java | 31 +++++++++++++++++++-
4 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82aa7969/src/java/org/apache/cassandra/utils/btree/Builder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82aa7969/src/java/org/apache/cassandra/utils/btree/NodeBuilder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82aa7969/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java
----------------------------------------------------------------------
