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/bd643132 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd643132 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd643132 Branch: refs/heads/trunk Commit: bd64313231a91f879697450998ca5cffa49bcc2f Parents: 16bb16e f5fd02f Author: Aleksey Yeschenko <[email protected]> Authored: Fri Apr 25 03:43:29 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Apr 25 03:43:29 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../cassandra/cache/RefCountedMemory.java | 7 ++- .../cassandra/cache/SerializingCache.java | 53 +++++++++++++++----- 3 files changed, 48 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd643132/CHANGES.txt ----------------------------------------------------------------------
