Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b23e91f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b23e91f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b23e91f8 Branch: refs/heads/trunk Commit: b23e91f82792a247262e346c27124bf29d29d59d Parents: e49567f 28afa1c Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue May 26 01:29:52 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue May 26 01:29:52 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
