Merge branch 'cassandra-3.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/e75ebc4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e75ebc4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e75ebc4f Branch: refs/heads/trunk Commit: e75ebc4f6b92013f92d93abb56d1c1325d4f2c15 Parents: 04e5ec3 6e5d16b Author: Robert Stupp <[email protected]> Authored: Thu Sep 17 23:24:20 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Thu Sep 17 23:24:20 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../apache/cassandra/cache/AutoSavingCache.java | 50 ++++++++++++++------ .../apache/cassandra/cql3/KeyCacheCqlTest.java | 1 + 3 files changed, 37 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e75ebc4f/CHANGES.txt ----------------------------------------------------------------------
