From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Nov 2019 16:27:04 +0000 (-0600)
Subject: Merge PR #31329 into master
X-Git-Tag: v15.1.0~1052
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce729f4023def09bbc94684a43994d34d7f6ae55;p=ceph.git

Merge PR #31329 into master

* refs/pull/31329/head:
	ceph-daemon: Fix `ls` cmd for legacy confs

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

ce729f4023def09bbc94684a43994d34d7f6ae55