Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0422470 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0422470 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0422470 Branch: refs/heads/trunk Commit: f04224707d29544228e791f0b532a9969da2820b Parents: a0a9494 0a25085 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Mar 29 11:10:28 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Mar 29 11:10:28 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/db/ColumnFamilyStore.java | 20 ++++----- .../db/compaction/CompactionManager.java | 44 +++++++++++++------- .../cassandra/service/StorageService.java | 30 ++++++++++--- .../cassandra/service/StorageServiceMBean.java | 8 ++++ .../org/apache/cassandra/tools/NodeProbe.java | 38 ++++++++++------- .../cassandra/tools/nodetool/Cleanup.java | 9 +++- .../tools/nodetool/RelocateSSTables.java | 8 +++- .../apache/cassandra/tools/nodetool/Scrub.java | 13 ++++-- .../tools/nodetool/UpgradeSSTable.java | 10 ++++- .../org/apache/cassandra/db/CleanupTest.java | 6 +-- .../unit/org/apache/cassandra/db/ScrubTest.java | 16 +++---- 12 files changed, 141 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0422470/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0422470/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0422470/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
