]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit8f3d7a6d56d9a1e0709256bd8512f850cfe01354
treefcedf674bd2fc977d7f073d3102c79525c8616eatree | snapshot
parent974bd43461735c3f4ff068060aa9b6926a472a85commit | diff
parent28707a4cd0e1dbca32f21b0e25c7d6abb828e9a6commit | diff
Merge PR #24925 into master

* 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>
src/common/options.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.