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/709510e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/709510e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/709510e3 Branch: refs/heads/trunk Commit: 709510e32a5ccd61a75c02c68c1d519dd2bb25c4 Parents: 989c3aa a472aa9 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Aug 6 21:54:45 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Aug 6 21:54:45 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 96 ++++++++------ .../cassandra/config/DatabaseDescriptor.java | 13 +- .../io/util/ChecksummedRandomAccessReader.java | 110 ++++++++++++++++ .../io/util/DataIntegrityMetadata.java | 17 ++- .../io/ChecksummedRandomAccessReaderTest.java | 127 +++++++++++++++++++ 6 files changed, 319 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/709510e3/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
