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/1fce6484 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fce6484 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fce6484 Branch: refs/heads/trunk Commit: 1fce64843daeb4208dc066c5ac1e41e58c655be0 Parents: 6a4d106 8fc1b28 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Feb 29 15:39:36 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Feb 29 15:39:36 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fce6484/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java ----------------------------------------------------------------------
