From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Dec 2019 03:23:55 +0000 (-0600)
Subject: Merge PR #32096 into master
X-Git-Tag: v15.1.0~625
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=409608704c046003016869da58ec79e04dfe09a9;p=ceph-ci.git

Merge PR #32096 into master

* refs/pull/32096/head:
	ceph-daemon: fix firewalld error case

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

409608704c046003016869da58ec79e04dfe09a9