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/8e808aed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e808aed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e808aed Branch: refs/heads/trunk Commit: 8e808aed6f181b5551eed72b33dbe50a5c51b23f Parents: f91cfc7 a2b66bf Author: Robert Stupp <sn...@snazy.de> Authored: Tue Mar 31 11:22:19 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Tue Mar 31 11:22:27 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cache/AutoSavingCache.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e808aed/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e808aed/src/java/org/apache/cassandra/cache/AutoSavingCache.java ----------------------------------------------------------------------
