]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbb9bfd 1c081dd)
Merge PR #24755 into master
authorSage Weil <sage@redhat.com>
Tue, 30 Oct 2018 15:20:02 +0000 (10:20 -0500)
committerSage Weil <sage@redhat.com>
Tue, 30 Oct 2018 15:20:02 +0000 (10:20 -0500)
* refs/pull/24755/head:
mgr/diskprediction: use global device_failure_prediction_mode setting

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.