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/9e8741f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e8741f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e8741f2 Branch: refs/heads/trunk Commit: 9e8741f28fbb27803d0cf95bbe34621f2ede80c6 Parents: b1c7398 213aab8 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Aug 11 10:22:03 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Aug 11 10:22:03 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/tools/SSTableExpiredBlockers.java | 136 +++++++++++++++++++ .../cassandra/db/compaction/TTLExpiryTest.java | 32 +++++ tools/bin/sstableexpiredblockers | 54 ++++++++ tools/bin/sstableexpiredblockers.bat | 23 ++++ 5 files changed, 246 insertions(+) ----------------------------------------------------------------------
