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/e034d3fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e034d3fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e034d3fd Branch: refs/heads/trunk Commit: e034d3fd7d8756bfba42f3fb7370e3a604e22fac Parents: 555f89c 6065f2c Author: Benedict Elliott Smith <[email protected]> Authored: Thu Feb 19 12:13:37 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Feb 19 12:13:37 2015 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/util/SafeMemory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
