]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 974bd43 28707a4)
Merge PR #24925 into master
authorSage Weil <sage@redhat.com>
Fri, 9 Nov 2018 14:37:10 +0000 (08:37 -0600)
committerSage Weil <sage@redhat.com>
Fri, 9 Nov 2018 14:37:10 +0000 (08:37 -0600)
* refs/pull/24925/head:
Avoid import _strptime failed
Avoid exception if remote plugin not enabled
Separate diskprediction local plugin from the diskprediction plugin

Reviewed-by: Sage Weil <sage@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.