From: Sage Weil <sage@redhat.com>
Date: Mon, 8 Jul 2019 22:46:06 +0000 (-0500)
Subject: Merge PR #28848 into master
X-Git-Tag: v15.1.0~2266
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0403f5a41f6287a917037d462e09cb92d427550;p=ceph.git

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>
---

c0403f5a41f6287a917037d462e09cb92d427550