From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Feb 2020 14:16:12 +0000 (-0600)
Subject: Merge PR #33484 into master
X-Git-Tag: v15.1.1~290
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12d9d00f3bca88ffd4f0b87945141a8c5276e4c1;p=ceph.git

Merge PR #33484 into master

* refs/pull/33484/head:
	mgr/cephadm: catch exceptions when scraping ceph-volume inventory

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

12d9d00f3bca88ffd4f0b87945141a8c5276e4c1