Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ad8a3d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ad8a3d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ad8a3d3 Branch: refs/heads/trunk Commit: 5ad8a3d3aa94b864f72ca587d9117f1458a47f34 Parents: 6772247 667e3db Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Dec 5 09:44:18 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Dec 5 09:44:18 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 5 ++++- .../apache/cassandra/cache/AutoSavingCache.java | 22 ++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad8a3d3/CHANGES.txt ----------------------------------------------------------------------
