Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/587b654e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/587b654e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/587b654e Branch: refs/heads/trunk Commit: 587b654ed32c93dbe5b365a35b0be1b326780d98 Parents: bb1f131 6bd08ae Author: Dave Brosius <[email protected]> Authored: Tue May 26 00:49:23 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue May 26 00:49:23 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/587b654e/src/java/org/apache/cassandra/db/compaction/Scrubber.java ----------------------------------------------------------------------
