]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14436 from dachary/wip-19513-ceph-disk-device-class
authorSage Weil <sage@newdream.net>
Tue, 18 Apr 2017 17:43:04 +0000 (12:43 -0500)
committerGitHub <noreply@github.com>
Tue, 18 Apr 2017 17:43:04 +0000 (12:43 -0500)
ceph-disk,osd: add support for crush device classes

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/ceph-disk/ceph_disk/main.py
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSD.h

Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge