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/f41bac7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f41bac7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f41bac7b Branch: refs/heads/trunk Commit: f41bac7bdc4c67bcd9d82e044ec47dcf59df17f0 Parents: 2d37437 bf43534 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Wed Feb 11 16:07:37 2015 +0000 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Wed Feb 11 16:07:37 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/io/util/Memory.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f41bac7b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f41bac7b/src/java/org/apache/cassandra/io/util/Memory.java ----------------------------------------------------------------------
