]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33484 into master
authorSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 14:16:12 +0000 (08:16 -0600)
committerSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 14:16:12 +0000 (08:16 -0600)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge