Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2eb7bd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2eb7bd7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2eb7bd7 Branch: refs/heads/trunk Commit: c2eb7bd7ddb83d0a4d4612adb0e3ebd773c8ba67 Parents: acdbdc2 0bb32f0 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Sep 7 07:56:58 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Sep 7 07:56:58 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2eb7bd7/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java ----------------------------------------------------------------------