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/343b3fdb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/343b3fdb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/343b3fdb Branch: refs/heads/trunk Commit: 343b3fdbcf04a4ab049e50123e3c7e9b5b6835ce Parents: 0d533ef 7c0c34b Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Apr 25 17:04:15 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Apr 25 17:04:15 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cache/RefCountedMemory.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------
