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/9068a31f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9068a31f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9068a31f Branch: refs/heads/trunk Commit: 9068a31f9bd9f8761c9527daed280a1847405af1 Parents: 829b9b7 8ebd590 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Thu Sep 3 13:53:00 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Thu Sep 3 13:53:00 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/Directories.java | 7 +- .../db/WindowsFailedSnapshotTracker.java | 2 +- .../db/compaction/CompactionManager.java | 5 + .../cassandra/db/lifecycle/TransactionLog.java | 4 + .../io/sstable/SnapshotDeletingTask.java | 83 +++++++++++++++ .../db/commitlog/SnapshotDeletingTest.java | 106 +++++++++++++++++++ .../db/compaction/CompactionsTest.java | 3 +- 8 files changed, 203 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9068a31f/CHANGES.txt ----------------------------------------------------------------------
