]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6824 from Sandy4999/wip-crushtool-build
authorSage Weil <sage@redhat.com>
Thu, 31 Dec 2015 14:32:01 +0000 (09:32 -0500)
committerSage Weil <sage@redhat.com>
Thu, 31 Dec 2015 14:32:01 +0000 (09:32 -0500)
crushtool: set type 0 name "device" for --build option

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/crush/CrushCompiler.cc
src/tools/crushtool.cc

Simple merge
Simple merge