From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Nov 2019 15:41:11 +0000 (-0600)
Subject: Merge PR #31439 into master
X-Git-Tag: v15.1.0~1019
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5964f5f2bd07177d75cdd0218b57d5451782d6f3;p=ceph.git

Merge PR #31439 into master

* refs/pull/31439/head:
	ceph-daemon: fix traceback during `ls` command

Reviewed-by: Sage Weil <sage@redhat.com>
---

5964f5f2bd07177d75cdd0218b57d5451782d6f3