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/e49567ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e49567ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e49567ff Branch: refs/heads/trunk Commit: e49567ff85499343f28631ab65c55eaacd6b8694 Parents: 419bedc d85bf4a Author: Dave Brosius <[email protected]> Authored: Tue May 26 00:57:42 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue May 26 00:57:42 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/Scrubber.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
