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/90ade6b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90ade6b4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90ade6b4 Branch: refs/heads/trunk Commit: 90ade6b45921c1a102cf97fa3fea7fca8462a085 Parents: a88c7e1 63407db Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Jul 31 08:00:42 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Jul 31 08:00:42 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 23 ++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90ade6b4/CHANGES.txt ----------------------------------------------------------------------
