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/aa41b6d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa41b6d0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa41b6d0 Branch: refs/heads/trunk Commit: aa41b6d0f0343ca2a67e0bc88abb554d0691d372 Parents: 108f3de 5335960 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Sep 7 08:02:07 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Sep 7 08:02:07 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------
