]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d3d59b ef882d1)
Merge PR #28848 into master
authorSage Weil <sage@redhat.com>
Mon, 8 Jul 2019 22:46:06 +0000 (17:46 -0500)
committerSage Weil <sage@redhat.com>
Mon, 8 Jul 2019 22:46:06 +0000 (17:46 -0500)
commitc0403f5a41f6287a917037d462e09cb92d427550
tree067aa32eab982ee91b2fc62c11b39fdc149d8b92tree | snapshot
parent1d3d59be1f52479f6941b610830e9ce8895b53b6commit | diff
parentef882d10a09310be31f6585efbdf3f87a779a9fdcommit | diff
Merge PR #28848 into master

* refs/pull/28848/head:
common/blkdev: only pay attention to first 2 bits of smartctl return code
common/blkdev: include stdout and stderr on join error
common/blkdev: fix syntax of error message
common/blkdev: fix smartctl output in error path
common/blkdev: include bad json from smartctl when unparseable
mgr/devicehealth: sort keys when dumping metrics

Reviewed-by: Dan Mick <dmick@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.