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/419bedc6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/419bedc6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/419bedc6 Branch: refs/heads/trunk Commit: 419bedc617b52852da24ec71af41c99fe8d98f6c Parents: 7f38300 587b654 Author: Dave Brosius <[email protected]> Authored: Tue May 26 00:50:20 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue May 26 00:50:20 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
