]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #24502 into master
authorSage Weil <sage@redhat.com>
Wed, 28 Nov 2018 03:32:04 +0000 (21:32 -0600)
committerSage Weil <sage@redhat.com>
Wed, 28 Nov 2018 03:32:04 +0000 (21:32 -0600)
* refs/pull/24502/head:
crushtool: implement --rebuild-class-roots command
crushtool: make --reweight re-sum choose_args weight-sets too
crushtool: --reweight should only reweight nonshadow roots
crush/CrushWrapper: reclassify: use default parent for created buckets
crush/CrushWrapper: reclassify: handle to-be-created buckets that we need twice
test/cli/crushtool/reclassify: add second gabe test case
crushtool: add --set-subtree-class; do not set class via --reclassify-root
test/cli/crushtool/reclassify: add reclassify test cases
doc/rados/operations/crush*: document reclassify
doc/rados/operations/crush: remove instructions for separate crush trees for ssd
crushtool: add --compare command
crushtool: implement --reclassify
crush/CrushCompiler: fix id scan to include class ids

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
doc/rados/operations/crush-map-edits.rst
src/crush/CrushWrapper.cc
src/crush/CrushWrapper.h

Simple merge
Simple merge