Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f0b2dfc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f0b2dfc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f0b2dfc Branch: refs/heads/trunk Commit: 0f0b2dfce2c62612e559e32c239ad8cd2d766505 Parents: d9083a9 a8a3a73 Author: Josh McKenzie <[email protected]> Authored: Sun May 8 20:33:02 2016 -0400 Committer: Josh McKenzie <[email protected]> Committed: Sun May 8 20:33:02 2016 -0400 ---------------------------------------------------------------------- .../apache/cassandra/utils/memory/NativeAllocator.java | 10 ++++++++++ .../org/apache/cassandra/utils/memory/SlabAllocator.java | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
