Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63407db7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63407db7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63407db7 Branch: refs/heads/trunk Commit: 63407db7e946bbf5aa796367375fd9cb46ba36c4 Parents: 40d7bdf ef099c3 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Jul 31 08:00:30 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Jul 31 08:00:30 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/63407db7/CHANGES.txt ----------------------------------------------------------------------
