Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a17ec87 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a17ec87 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a17ec87 Branch: refs/heads/trunk Commit: 5a17ec875865c25b9304808eaed9fb0336bdc90e Parents: fbc38cd 708b0ce Author: Benedict Elliott Smith <[email protected]> Authored: Wed Feb 11 11:21:42 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Feb 11 11:21:42 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a17ec87/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a17ec87/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java ----------------------------------------------------------------------
