Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53359607 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53359607 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53359607 Branch: refs/heads/cassandra-3.0 Commit: 53359607640b064db91ff772e3c0e487eb03f7c4 Parents: a7895cf 99c6ad6 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Sep 7 08:01:29 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Sep 7 08:01:29 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/53359607/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java ----------------------------------------------------------------------
