From: Sage Weil <sage@redhat.com>
Date: Wed, 13 Nov 2019 19:14:12 +0000 (-0600)
Subject: Merge PR #31614 into master
X-Git-Tag: v15.1.0~908
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ffb5d9e79207da81af933f4e95655e16558c739;p=ceph.git

Merge PR #31614 into master

* refs/pull/31614/head:
	ceph-daemon: use `-e` instead of `--env`

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

7ffb5d9e79207da81af933f4e95655e16558c739