From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Dec 2019 23:04:02 +0000 (-0600)
Subject: Merge PR #32218 into master
X-Git-Tag: v15.1.0~525
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40db88b70f53b1f31a63f55634152174bb01eb4d;p=ceph.git

Merge PR #32218 into master

* refs/pull/32218/head:
	cephadm: use raw string during `re.sub`
	cephadm: fix ConfigParser DeprecationWarning in py3

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

40db88b70f53b1f31a63f55634152174bb01eb4d