]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24151 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Oct 2018 22:43:02 +0000 (17:43 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Oct 2018 22:43:02 +0000 (17:43 -0500)
* refs/pull/24151/head:
mgr/devicehealth: use is_valid_daemon_name helper
mgr/devicehealth: generalize to mon and osd daemons
mon: implement 'smart [devid]' tell command
mgr: parse mon metadata properly
mon: report device id used by mon
common/blkdev: add get_device_by_path
common/blkdev: migrate block_device_run_smartctl from OSD.cc

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/common/options.cc
src/mon/Monitor.cc
src/osd/OSD.cc
src/osd/OSD.h
src/pybind/mgr/devicehealth/module.py

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