From: Sage Weil <sage@redhat.com>
Date: Sun, 10 Nov 2019 02:38:35 +0000 (-0600)
Subject: Merge PR #31507 into master
X-Git-Tag: v15.1.0~969
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e9edae1a14e48707512be278bc17c72e843ee4a;p=ceph.git

Merge PR #31507 into master

* refs/pull/31507/head:
	ceph-daemon: ceph/daemon-base:latest-master-devel

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

2e9edae1a14e48707512be278bc17c72e843ee4a