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/5c413ef7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c413ef7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c413ef7 Branch: refs/heads/trunk Commit: 5c413ef76062da188ff661064ef45a02b5e5beda Parents: bade0fb ff1a156 Author: Yuki Morishita <[email protected]> Authored: Tue May 19 09:00:17 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue May 19 09:00:17 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 8 ++-- .../db/compaction/CompactionManager.java | 8 ++-- .../cassandra/db/compaction/Scrubber.java | 8 ++-- .../cassandra/service/StorageService.java | 7 +++- .../cassandra/service/StorageServiceMBean.java | 2 + .../org/apache/cassandra/tools/NodeProbe.java | 8 ++-- .../cassandra/tools/StandaloneScrubber.java | 6 ++- .../apache/cassandra/tools/nodetool/Scrub.java | 9 ++++- .../unit/org/apache/cassandra/db/ScrubTest.java | 42 ++++++++++++++------ 10 files changed, 66 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
