From: Sage Weil <sage@redhat.com>
Date: Wed, 30 Oct 2019 19:04:07 +0000 (-0500)
Subject: Merge PR #31264 into master
X-Git-Tag: v15.1.0~1104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2c66f3879253f10471cd22547f9e3b60f79a203;p=ceph.git

Merge PR #31264 into master

* refs/pull/31264/head:
	ceph-daemon: deal with lack of TemporaryDirectory on py2
	ceph-daemon: make StringIO usage py2 compatible
	ceph-daemon: make ConfigParser py2 compatible

Reviewed-by: Alfredo Deza <adeza@redhat.com>
---

d2c66f3879253f10471cd22547f9e3b60f79a203