From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Nov 2019 15:42:03 +0000 (-0600)
Subject: Merge PR #31487 into master
X-Git-Tag: v15.1.0~933
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4f54154598063d48eca1958b14921e27a8bd7920;p=ceph-ci.git

Merge PR #31487 into master

* refs/pull/31487/head:
	ceph-daemon: add `--base-dir` arg to `adopt` command

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

4f54154598063d48eca1958b14921e27a8bd7920