From: Sage Weil <sage@redhat.com>
Date: Wed, 13 Nov 2019 13:03:46 +0000 (-0600)
Subject: Merge PR #31585 into master
X-Git-Tag: v15.1.0~917
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6c5db46adc88287c797e0bc0b4cba59662ca0177;p=ceph-ci.git

Merge PR #31585 into master

* refs/pull/31585/head:
	ceph-daemon: add `--legacy-dir` arg to `ls` command

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

6c5db46adc88287c797e0bc0b4cba59662ca0177